Bläddra i källkod

Merge branch 'master' of http://192.168.123.2:3000/ck/XiuXianGame

lzx 1 dag sedan
förälder
incheckning
45e574f784

+ 146 - 34
Assets/Art/Environment/fukong dao2.prefab

@@ -1,79 +1,191 @@
 %YAML 1.1
 %TAG !u! tag:yousandi.cn,2023:
---- !u!1001 &4539639384097622214
+--- !u!1 &354955946429195138
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 6531860447979389797}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: fukong dao2
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &6531860447979389797
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 354955946429195138}
+  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: 2635808446306131277}
+  m_Father: {fileID: 0}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1 &3515542236926725537
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 3729367683394581911, guid: 77e0e1e49e343a4488ae529b0fecc739, type: 3}
+  m_PrefabInstance: {fileID: 1922033871240831382}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 2635808446306131277}
+  - component: {fileID: 7422373066537718526}
+  - component: {fileID: 275904094642747149}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: fukong dao2 (2)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &2635808446306131277
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 4074262922870550317, guid: 77e0e1e49e343a4488ae529b0fecc739, type: 3}
+  m_PrefabInstance: {fileID: 1922033871240831382}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3515542236926725537}
+  serializedVersion: 2
+  m_LocalRotation: {x: -0.2571829, y: 0.65867823, z: 0.65867823, w: 0.2571829}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 3.2728, y: 3.2728, z: 3.2728}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 6531860447979389797}
+  m_LocalEulerAnglesHint: {x: -90, y: 0, z: 137.343}
+--- !u!33 &7422373066537718526
+MeshFilter:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 1091396269776134280, guid: 77e0e1e49e343a4488ae529b0fecc739, type: 3}
+  m_PrefabInstance: {fileID: 1922033871240831382}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3515542236926725537}
+  m_Mesh: {fileID: 3223647848749318582, guid: ebe13b67332437f478e3ba635a061233, type: 3}
+--- !u!23 &275904094642747149
+MeshRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 2936800325524362306, guid: 77e0e1e49e343a4488ae529b0fecc739, type: 3}
+  m_PrefabInstance: {fileID: 1922033871240831382}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3515542236926725537}
+  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_virtualGeometry: 0
+  m_virtualGeometryShadow: 0
+  m_ShadingRate: 0
+  m_RenderingLayerMask: 1
+  m_RendererPriority: 0
+  m_Materials:
+  - {fileID: 2100000, guid: 2fbad5578d83a1542af401388dee05bb, 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!1001 &1922033871240831382
 PrefabInstance:
   m_ObjectHideFlags: 0
   serializedVersion: 2
   m_Modification:
     serializedVersion: 3
-    m_TransformParent: {fileID: 0}
+    m_TransformParent: {fileID: 6531860447979389797}
     m_Modifications:
-    - target: {fileID: -8679921383154817045, guid: ebe13b67332437f478e3ba635a061233, type: 3}
+    - target: {fileID: 0}
+      propertyPath: m_Name
+      value: fukong dao2 (2)
+      objectReference: {fileID: 0}
+    - target: {fileID: 0}
       propertyPath: m_LocalScale.x
-      value: 2
+      value: 3.2728
       objectReference: {fileID: 0}
-    - target: {fileID: -8679921383154817045, guid: ebe13b67332437f478e3ba635a061233, type: 3}
+    - target: {fileID: 0}
       propertyPath: m_LocalScale.y
-      value: 2
+      value: 3.2728
       objectReference: {fileID: 0}
-    - target: {fileID: -8679921383154817045, guid: ebe13b67332437f478e3ba635a061233, type: 3}
+    - target: {fileID: 0}
       propertyPath: m_LocalScale.z
-      value: 2
+      value: 3.2728
       objectReference: {fileID: 0}
-    - target: {fileID: -8679921383154817045, guid: ebe13b67332437f478e3ba635a061233, type: 3}
+    - target: {fileID: 0}
       propertyPath: m_LocalPosition.x
-      value: 3.6000004
+      value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: -8679921383154817045, guid: ebe13b67332437f478e3ba635a061233, type: 3}
+    - target: {fileID: 0}
       propertyPath: m_LocalPosition.y
-      value: 6
+      value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: -8679921383154817045, guid: ebe13b67332437f478e3ba635a061233, type: 3}
+    - target: {fileID: 0}
       propertyPath: m_LocalPosition.z
-      value: 13.400002
+      value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: -8679921383154817045, guid: ebe13b67332437f478e3ba635a061233, type: 3}
+    - target: {fileID: 0}
       propertyPath: m_LocalRotation.w
       value: 0.2571829
       objectReference: {fileID: 0}
-    - target: {fileID: -8679921383154817045, guid: ebe13b67332437f478e3ba635a061233, type: 3}
+    - target: {fileID: 0}
       propertyPath: m_LocalRotation.x
       value: -0.2571829
       objectReference: {fileID: 0}
-    - target: {fileID: -8679921383154817045, guid: ebe13b67332437f478e3ba635a061233, type: 3}
+    - target: {fileID: 0}
       propertyPath: m_LocalRotation.y
       value: 0.65867823
       objectReference: {fileID: 0}
-    - target: {fileID: -8679921383154817045, guid: ebe13b67332437f478e3ba635a061233, type: 3}
+    - target: {fileID: 0}
       propertyPath: m_LocalRotation.z
       value: 0.65867823
       objectReference: {fileID: 0}
-    - target: {fileID: -8679921383154817045, guid: ebe13b67332437f478e3ba635a061233, type: 3}
+    - target: {fileID: 0}
       propertyPath: m_LocalEulerAnglesHint.x
       value: -90
       objectReference: {fileID: 0}
-    - target: {fileID: -8679921383154817045, guid: ebe13b67332437f478e3ba635a061233, type: 3}
+    - target: {fileID: 0}
       propertyPath: m_LocalEulerAnglesHint.y
       value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: -8679921383154817045, guid: ebe13b67332437f478e3ba635a061233, type: 3}
+    - target: {fileID: 0}
       propertyPath: m_LocalEulerAnglesHint.z
       value: 137.343
       objectReference: {fileID: 0}
-    - target: {fileID: -7511558181221131132, guid: ebe13b67332437f478e3ba635a061233, type: 3}
-      propertyPath: m_Materials.Array.data[0]
-      value: 
-      objectReference: {fileID: 2100000, guid: 2fbad5578d83a1542af401388dee05bb, type: 2}
-    - target: {fileID: -7511558181221131132, guid: ebe13b67332437f478e3ba635a061233, type: 3}
-      propertyPath: m_Materials.Array.data[1]
-      value: 
-      objectReference: {fileID: 2100000, guid: 2fbad5578d83a1542af401388dee05bb, type: 2}
-    - target: {fileID: 919132149155446097, guid: ebe13b67332437f478e3ba635a061233, type: 3}
-      propertyPath: m_Name
-      value: fukong dao2
-      objectReference: {fileID: 0}
     m_RemovedComponents: []
     m_RemovedGameObjects: []
     m_AddedGameObjects: []
     m_AddedComponents: []
-  m_SourcePrefab: {fileID: 100100000, guid: ebe13b67332437f478e3ba635a061233, type: 3}
+  m_SourcePrefab: {fileID: 0}

+ 139 - 39
Assets/Art/Environment/fukong dao3.prefab

@@ -1,79 +1,179 @@
 %YAML 1.1
 %TAG !u! tag:yousandi.cn,2023:
---- !u!1001 &4247043276436770419
+--- !u!1 &765340368279689263
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 3905164629616407330, guid: 0685c296e9c07cd498a8a553f623bebe, type: 3}
+  m_PrefabInstance: {fileID: 8029598009332787400}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 4947522758557136696}
+  - component: {fileID: 3445450105515365864}
+  - component: {fileID: 3727334830803835583}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: fukong dao3
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &4947522758557136696
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 4429921519942298008, guid: 0685c296e9c07cd498a8a553f623bebe, type: 3}
+  m_PrefabInstance: {fileID: 8029598009332787400}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 765340368279689263}
+  serializedVersion: 2
+  m_LocalRotation: {x: -0.24617667, y: -0.66287035, z: -0.66287035, w: 0.24617667}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 4, y: 4, z: 4}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 4160862028817849242}
+  m_LocalEulerAnglesHint: {x: -90, y: 0, z: -139.252}
+--- !u!33 &3445450105515365864
+MeshFilter:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 780782669881140797, guid: 0685c296e9c07cd498a8a553f623bebe, type: 3}
+  m_PrefabInstance: {fileID: 8029598009332787400}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 765340368279689263}
+  m_Mesh: {fileID: -6909115843317292050, guid: deaf9329040a1614a8e54df31a46a5de, type: 3}
+--- !u!23 &3727334830803835583
+MeshRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 3256404872649183991, guid: 0685c296e9c07cd498a8a553f623bebe, type: 3}
+  m_PrefabInstance: {fileID: 8029598009332787400}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 765340368279689263}
+  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_virtualGeometry: 0
+  m_virtualGeometryShadow: 0
+  m_ShadingRate: 0
+  m_RenderingLayerMask: 1
+  m_RendererPriority: 0
+  m_Materials:
+  - {fileID: 2100000, guid: 2fbad5578d83a1542af401388dee05bb, 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 &8855316551847403815
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 4160862028817849242}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: fukong dao3
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &4160862028817849242
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8855316551847403815}
+  serializedVersion: 2
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: -5.9, z: -61.7}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children:
+  - {fileID: 4947522758557136696}
+  m_Father: {fileID: 0}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1001 &8029598009332787400
 PrefabInstance:
   m_ObjectHideFlags: 0
   serializedVersion: 2
   m_Modification:
     serializedVersion: 3
-    m_TransformParent: {fileID: 0}
+    m_TransformParent: {fileID: 4160862028817849242}
     m_Modifications:
-    - target: {fileID: -8679921383154817045, guid: deaf9329040a1614a8e54df31a46a5de, type: 3}
-      propertyPath: m_LocalScale.x
-      value: 4
-      objectReference: {fileID: 0}
-    - target: {fileID: -8679921383154817045, guid: deaf9329040a1614a8e54df31a46a5de, type: 3}
-      propertyPath: m_LocalScale.y
-      value: 4
-      objectReference: {fileID: 0}
-    - target: {fileID: -8679921383154817045, guid: deaf9329040a1614a8e54df31a46a5de, type: 3}
-      propertyPath: m_LocalScale.z
-      value: 4
+    - target: {fileID: 0}
+      propertyPath: m_Name
+      value: fukong dao3
       objectReference: {fileID: 0}
-    - target: {fileID: -8679921383154817045, guid: deaf9329040a1614a8e54df31a46a5de, type: 3}
+    - target: {fileID: 0}
       propertyPath: m_LocalPosition.x
-      value: 5.8
+      value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: -8679921383154817045, guid: deaf9329040a1614a8e54df31a46a5de, type: 3}
+    - target: {fileID: 0}
       propertyPath: m_LocalPosition.y
-      value: 36
+      value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: -8679921383154817045, guid: deaf9329040a1614a8e54df31a46a5de, type: 3}
+    - target: {fileID: 0}
       propertyPath: m_LocalPosition.z
-      value: 135.8
+      value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: -8679921383154817045, guid: deaf9329040a1614a8e54df31a46a5de, type: 3}
+    - target: {fileID: 0}
       propertyPath: m_LocalRotation.w
       value: 0.24617667
       objectReference: {fileID: 0}
-    - target: {fileID: -8679921383154817045, guid: deaf9329040a1614a8e54df31a46a5de, type: 3}
+    - target: {fileID: 0}
       propertyPath: m_LocalRotation.x
       value: -0.24617667
       objectReference: {fileID: 0}
-    - target: {fileID: -8679921383154817045, guid: deaf9329040a1614a8e54df31a46a5de, type: 3}
+    - target: {fileID: 0}
       propertyPath: m_LocalRotation.y
       value: -0.66287035
       objectReference: {fileID: 0}
-    - target: {fileID: -8679921383154817045, guid: deaf9329040a1614a8e54df31a46a5de, type: 3}
+    - target: {fileID: 0}
       propertyPath: m_LocalRotation.z
       value: -0.66287035
       objectReference: {fileID: 0}
-    - target: {fileID: -8679921383154817045, guid: deaf9329040a1614a8e54df31a46a5de, type: 3}
+    - target: {fileID: 0}
       propertyPath: m_LocalEulerAnglesHint.x
       value: -90
       objectReference: {fileID: 0}
-    - target: {fileID: -8679921383154817045, guid: deaf9329040a1614a8e54df31a46a5de, type: 3}
+    - target: {fileID: 0}
       propertyPath: m_LocalEulerAnglesHint.y
       value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: -8679921383154817045, guid: deaf9329040a1614a8e54df31a46a5de, type: 3}
+    - target: {fileID: 0}
       propertyPath: m_LocalEulerAnglesHint.z
       value: -139.252
       objectReference: {fileID: 0}
-    - target: {fileID: -7511558181221131132, guid: deaf9329040a1614a8e54df31a46a5de, type: 3}
-      propertyPath: m_Materials.Array.data[0]
-      value: 
-      objectReference: {fileID: 2100000, guid: 2fbad5578d83a1542af401388dee05bb, type: 2}
-    - target: {fileID: 919132149155446097, guid: deaf9329040a1614a8e54df31a46a5de, type: 3}
-      propertyPath: m_Name
-      value: fukong dao3
-      objectReference: {fileID: 0}
-    - target: {fileID: 919132149155446097, guid: deaf9329040a1614a8e54df31a46a5de, type: 3}
-      propertyPath: m_IsActive
-      value: 1
-      objectReference: {fileID: 0}
     m_RemovedComponents: []
     m_RemovedGameObjects: []
     m_AddedGameObjects: []
     m_AddedComponents: []
-  m_SourcePrefab: {fileID: 100100000, guid: deaf9329040a1614a8e54df31a46a5de, type: 3}
+  m_SourcePrefab: {fileID: 0}

+ 146 - 30
Assets/Art/Environment/fukong dao4.prefab

@@ -1,75 +1,191 @@
 %YAML 1.1
 %TAG !u! tag:yousandi.cn,2023:
---- !u!1001 &4586208307775021788
+--- !u!1 &1224579573862923457
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 3703108956536512397, guid: cdcc1e72df788f34092ee9d092668bbf, type: 3}
+  m_PrefabInstance: {fileID: 8365091946876407639}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 6140134704763648785}
+  - component: {fileID: 739692015363110405}
+  - component: {fileID: 7936720611081973566}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: fukong dao4
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &6140134704763648785
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 4048671560039220535, guid: cdcc1e72df788f34092ee9d092668bbf, type: 3}
+  m_PrefabInstance: {fileID: 8365091946876407639}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1224579573862923457}
+  serializedVersion: 2
+  m_LocalRotation: {x: -0.7071068, y: -0, z: -0, w: 0.7071068}
+  m_LocalPosition: {x: 0, y: 4.2, z: 0}
+  m_LocalScale: {x: 6.3410997, y: 6.3410997, z: 6.3410997}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 411656382419835695}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!33 &739692015363110405
+MeshFilter:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 1116926517609384594, guid: cdcc1e72df788f34092ee9d092668bbf, type: 3}
+  m_PrefabInstance: {fileID: 8365091946876407639}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1224579573862923457}
+  m_Mesh: {fileID: 6153351672944578211, guid: 63677335207fa85458d422635ffac560, type: 3}
+--- !u!23 &7936720611081973566
+MeshRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 2910708037704662616, guid: cdcc1e72df788f34092ee9d092668bbf, type: 3}
+  m_PrefabInstance: {fileID: 8365091946876407639}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1224579573862923457}
+  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_virtualGeometry: 0
+  m_virtualGeometryShadow: 0
+  m_ShadingRate: 0
+  m_RenderingLayerMask: 1
+  m_RendererPriority: 0
+  m_Materials:
+  - {fileID: 2100000, guid: 2fbad5578d83a1542af401388dee05bb, 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 &8291995275029873607
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 411656382419835695}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: fukong dao4
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &411656382419835695
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8291995275029873607}
+  serializedVersion: 2
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 46.8}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children:
+  - {fileID: 6140134704763648785}
+  m_Father: {fileID: 0}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1001 &8365091946876407639
 PrefabInstance:
   m_ObjectHideFlags: 0
   serializedVersion: 2
   m_Modification:
     serializedVersion: 3
-    m_TransformParent: {fileID: 0}
+    m_TransformParent: {fileID: 411656382419835695}
     m_Modifications:
-    - target: {fileID: -8679921383154817045, guid: 63677335207fa85458d422635ffac560, type: 3}
+    - target: {fileID: 0}
+      propertyPath: m_Name
+      value: fukong dao4
+      objectReference: {fileID: 0}
+    - target: {fileID: 0}
       propertyPath: m_LocalScale.x
-      value: 3
+      value: 6.3410997
       objectReference: {fileID: 0}
-    - target: {fileID: -8679921383154817045, guid: 63677335207fa85458d422635ffac560, type: 3}
+    - target: {fileID: 0}
       propertyPath: m_LocalScale.y
-      value: 3
+      value: 6.3410997
       objectReference: {fileID: 0}
-    - target: {fileID: -8679921383154817045, guid: 63677335207fa85458d422635ffac560, type: 3}
+    - target: {fileID: 0}
       propertyPath: m_LocalScale.z
-      value: 3
+      value: 6.3410997
       objectReference: {fileID: 0}
-    - target: {fileID: -8679921383154817045, guid: 63677335207fa85458d422635ffac560, type: 3}
+    - target: {fileID: 0}
       propertyPath: m_LocalPosition.x
-      value: -18.58
+      value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: -8679921383154817045, guid: 63677335207fa85458d422635ffac560, type: 3}
+    - target: {fileID: 0}
       propertyPath: m_LocalPosition.y
-      value: 7
+      value: 4.2
       objectReference: {fileID: 0}
-    - target: {fileID: -8679921383154817045, guid: 63677335207fa85458d422635ffac560, type: 3}
+    - target: {fileID: 0}
       propertyPath: m_LocalPosition.z
-      value: 81.1
+      value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: -8679921383154817045, guid: 63677335207fa85458d422635ffac560, type: 3}
+    - target: {fileID: 0}
       propertyPath: m_LocalRotation.w
       value: 0.7071068
       objectReference: {fileID: 0}
-    - target: {fileID: -8679921383154817045, guid: 63677335207fa85458d422635ffac560, type: 3}
+    - target: {fileID: 0}
       propertyPath: m_LocalRotation.x
       value: -0.7071068
       objectReference: {fileID: 0}
-    - target: {fileID: -8679921383154817045, guid: 63677335207fa85458d422635ffac560, type: 3}
+    - target: {fileID: 0}
       propertyPath: m_LocalRotation.y
       value: -0
       objectReference: {fileID: 0}
-    - target: {fileID: -8679921383154817045, guid: 63677335207fa85458d422635ffac560, type: 3}
+    - target: {fileID: 0}
       propertyPath: m_LocalRotation.z
       value: -0
       objectReference: {fileID: 0}
-    - target: {fileID: -8679921383154817045, guid: 63677335207fa85458d422635ffac560, type: 3}
+    - target: {fileID: 0}
       propertyPath: m_LocalEulerAnglesHint.x
       value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: -8679921383154817045, guid: 63677335207fa85458d422635ffac560, type: 3}
+    - target: {fileID: 0}
       propertyPath: m_LocalEulerAnglesHint.y
       value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: -8679921383154817045, guid: 63677335207fa85458d422635ffac560, type: 3}
+    - target: {fileID: 0}
       propertyPath: m_LocalEulerAnglesHint.z
       value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: -7511558181221131132, guid: 63677335207fa85458d422635ffac560, type: 3}
-      propertyPath: m_Materials.Array.data[0]
-      value: 
-      objectReference: {fileID: 2100000, guid: 2fbad5578d83a1542af401388dee05bb, type: 2}
-    - target: {fileID: 919132149155446097, guid: 63677335207fa85458d422635ffac560, type: 3}
-      propertyPath: m_Name
-      value: fukong dao4
-      objectReference: {fileID: 0}
     m_RemovedComponents: []
     m_RemovedGameObjects: []
     m_AddedGameObjects: []
     m_AddedComponents: []
-  m_SourcePrefab: {fileID: 100100000, guid: 63677335207fa85458d422635ffac560, type: 3}
+  m_SourcePrefab: {fileID: 0}

Filskillnaden har hållts tillbaka eftersom den är för stor
+ 256 - 1021
Assets/Art/cs3.scene


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

@@ -70,7 +70,7 @@ Camera:
     width: 1
     height: 1
   near clip plane: 0.3
-  far clip plane: 400
+  far clip plane: 600
   field of view: 60
   orthographic: 0
   orthographic size: 5

+ 4 - 4
Assets/Res/CombatScenes/LevelBattle01.prefab

@@ -52,10 +52,10 @@ MonoBehaviour:
   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
+  - {fileID: 354955946429195138, guid: 77e0e1e49e343a4488ae529b0fecc739, type: 3}
+  - {fileID: 8855316551847403815, guid: 0685c296e9c07cd498a8a553f623bebe, type: 3}
+  - {fileID: 8291995275029873607, guid: cdcc1e72df788f34092ee9d092668bbf, type: 3}
+  radius: 35
 --- !u!1001 &1744782095462081170
 PrefabInstance:
   m_ObjectHideFlags: 0

+ 675 - 0
Assets/Res/CombatScenes/LevelBattle03.prefab

@@ -0,0 +1,675 @@
+%YAML 1.1
+%TAG !u! tag:yousandi.cn,2023:
+--- !u!1 &150548690216489824
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 6405123835914438810}
+  - component: {fileID: 4021147250440459492}
+  - component: {fileID: 3250439012821130974}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: yunhai
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &6405123835914438810
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 150548690216489824}
+  serializedVersion: 2
+  m_LocalRotation: {x: 0.7071068, y: -0, z: -0, w: 0.7071068}
+  m_LocalPosition: {x: 0, y: 6.8, z: 0}
+  m_LocalScale: {x: 400.00003, y: 400.00003, z: 400.00003}
+  m_ConstrainProportionsScale: 1
+  m_Children: []
+  m_Father: {fileID: 7319546472223068688}
+  m_LocalEulerAnglesHint: {x: 90, y: 0, z: 0}
+--- !u!33 &4021147250440459492
+MeshFilter:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 150548690216489824}
+  m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0}
+--- !u!23 &3250439012821130974
+MeshRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 150548690216489824}
+  m_Enabled: 1
+  m_CastShadows: 0
+  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_virtualGeometry: 0
+  m_virtualGeometryShadow: 0
+  m_ShadingRate: 0
+  m_RenderingLayerMask: 1
+  m_RendererPriority: 0
+  m_Materials:
+  - {fileID: 2100000, guid: 1180e4a0056a38e4890530ba71c4ca9b, 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 &198328406000524784
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 8361006489289187437}
+  - component: {fileID: 323544711091677800}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: LevelBattle03
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &8361006489289187437
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 198328406000524784}
+  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: 7319546472223068688}
+  m_Father: {fileID: 0}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &323544711091677800
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 198328406000524784}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 9970cf7521114b5ebfee32908aec5603, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  skyObejct: {fileID: 6547143922713598540}
+  shengShiMaterial: {fileID: 2100000, guid: 5d9d871e58f5c1b4890049c6625f29c8, type: 2}
+  fogColor: {r: 0.21600002, g: 0.29280004, b: 0.6, a: 1}
+  fogStartDistance: 30
+  fogEndDistance: 80
+  allObject:
+  - {fileID: 5829875553534260591, guid: 96fc37aadb9bc8840ad5fa98172cd16f, type: 3}
+  radius: 45
+  dec: 
+--- !u!1 &1992128124337746356
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 7169143794090459126}
+  m_Layer: 7
+  m_HasEditorInfo: 1
+  m_Name: Landscape
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &7169143794090459126
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1992128124337746356}
+  serializedVersion: 2
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: -41, z: 0}
+  m_LocalScale: {x: 1, y: 0.5, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children:
+  - {fileID: 3271622544173978875}
+  m_Father: {fileID: 7319546472223068688}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1 &4509268593997191767
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 3585384551010318200}
+  - component: {fileID: 4077837472308421636}
+  - component: {fileID: 4513731945305176033}
+  m_Layer: 7
+  m_HasEditorInfo: 1
+  m_Name: yun_qiu
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &3585384551010318200
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4509268593997191767}
+  serializedVersion: 2
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 0.1, y: 0.1, z: 0.1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 7319546472223068688}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!33 &4077837472308421636
+MeshFilter:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4509268593997191767}
+  m_Mesh: {fileID: -6740526933416455741, guid: f8c594ef52ebfc44e98bdc02acc2a16c, type: 3}
+--- !u!23 &4513731945305176033
+MeshRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4509268593997191767}
+  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_virtualGeometry: 0
+  m_virtualGeometryShadow: 0
+  m_ShadingRate: 0
+  m_RenderingLayerMask: 1
+  m_RendererPriority: 0
+  m_Materials:
+  - {fileID: 2100000, guid: afd2d3f979649ab47b32169c16a1b2ed, 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 &5999680719607194215
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 8284061920447749403}
+  - component: {fileID: 3323727994700138633}
+  - component: {fileID: 8554734726673572177}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: SkyDome
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 0
+--- !u!4 &8284061920447749403
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5999680719607194215}
+  serializedVersion: 2
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: -10, z: 0}
+  m_LocalScale: {x: 3.5, y: 3, z: 3.5}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 7319546472223068688}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!23 &3323727994700138633
+MeshRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5999680719607194215}
+  m_Enabled: 1
+  m_CastShadows: 0
+  m_ReceiveShadows: 0
+  m_DynamicOccludee: 1
+  m_StaticShadowCaster: 0
+  m_MotionVectors: 1
+  m_LightProbeUsage: 1
+  m_ReflectionProbeUsage: 1
+  m_RayTracingMode: 2
+  m_RayTraceProcedural: 0
+  m_virtualGeometry: 0
+  m_virtualGeometryShadow: 0
+  m_ShadingRate: 0
+  m_RenderingLayerMask: 1
+  m_RendererPriority: 0
+  m_Materials:
+  - {fileID: 2100000, guid: 4ebb2e35dc241aa4c9310f57ae11706a, 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 &8554734726673572177
+MeshFilter:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5999680719607194215}
+  m_Mesh: {fileID: 4300000, guid: 1ded84720cc566a43b26b59b94db5f19, type: 2}
+--- !u!1 &6046298269311816277
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 3271622544173978875}
+  - component: {fileID: 3485194297984294891}
+  - component: {fileID: 6475305682505242889}
+  m_Layer: 7
+  m_HasEditorInfo: 1
+  m_Name: Mesh
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &3271622544173978875
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6046298269311816277}
+  serializedVersion: 2
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: -12.5, z: 0}
+  m_LocalScale: {x: 500, y: 96.43, z: 500}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 7169143794090459126}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!33 &3485194297984294891
+MeshFilter:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6046298269311816277}
+  m_Mesh: {fileID: 4300000, guid: ea79c817e57111a42a2481154a4f46bc, type: 2}
+--- !u!23 &6475305682505242889
+MeshRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6046298269311816277}
+  m_Enabled: 1
+  m_CastShadows: 0
+  m_ReceiveShadows: 0
+  m_DynamicOccludee: 0
+  m_StaticShadowCaster: 0
+  m_MotionVectors: 1
+  m_LightProbeUsage: 1
+  m_ReflectionProbeUsage: 1
+  m_RayTracingMode: 2
+  m_RayTraceProcedural: 0
+  m_virtualGeometry: 0
+  m_virtualGeometryShadow: 0
+  m_ShadingRate: 0
+  m_RenderingLayerMask: 1
+  m_RendererPriority: 0
+  m_Materials:
+  - {fileID: 2100000, guid: 63837601a8b53204d813f3789422f179, 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: 2
+  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 &6547143922713598540
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 7319546472223068688}
+  - component: {fileID: 4545472702346115186}
+  - component: {fileID: 6729040702508381507}
+  - component: {fileID: 871475261911766027}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: cj03
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &7319546472223068688
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6547143922713598540}
+  serializedVersion: 2
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1.7513, y: 1.7513, z: 1.7513}
+  m_ConstrainProportionsScale: 0
+  m_Children:
+  - {fileID: 6405123835914438810}
+  - {fileID: 3585384551010318200}
+  - {fileID: 6635004569205135084}
+  - {fileID: 7169143794090459126}
+  - {fileID: 8284061920447749403}
+  m_Father: {fileID: 8361006489289187437}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!33 &4545472702346115186
+MeshFilter:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6547143922713598540}
+  m_Mesh: {fileID: 0}
+--- !u!23 &6729040702508381507
+MeshRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6547143922713598540}
+  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_virtualGeometry: 0
+  m_virtualGeometryShadow: 0
+  m_ShadingRate: 0
+  m_RenderingLayerMask: 1
+  m_RendererPriority: 0
+  m_Materials:
+  - {fileID: 0}
+  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!64 &871475261911766027
+MeshCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6547143922713598540}
+  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: 0
+  m_CookingOptions: 30
+  m_Mesh: {fileID: 4300000, guid: 6623863f315e4184aab7c6e34e60b484, type: 2}
+--- !u!1 &9011782773388340285
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 6635004569205135084}
+  - component: {fileID: 7214187026765325610}
+  - component: {fileID: 8859997311264023016}
+  - component: {fileID: 3384701001157145936}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: FogHeight
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &6635004569205135084
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 9011782773388340285}
+  serializedVersion: 2
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 5, z: 0}
+  m_LocalScale: {x: 1000, y: 30, z: 500}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 7319546472223068688}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!33 &7214187026765325610
+MeshFilter:
+  m_ObjectHideFlags: 2
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 9011782773388340285}
+  m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
+--- !u!23 &8859997311264023016
+MeshRenderer:
+  m_ObjectHideFlags: 2
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 9011782773388340285}
+  m_Enabled: 1
+  m_CastShadows: 0
+  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_virtualGeometry: 0
+  m_virtualGeometryShadow: 0
+  m_ShadingRate: 0
+  m_RenderingLayerMask: 4294967295
+  m_RendererPriority: 0
+  m_Materials:
+  - {fileID: 2100000, guid: 9cc73a8117244d241ad801a4760c1375, 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!114 &3384701001157145936
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 9011782773388340285}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 334f5cfa565f62949a853f351ccdb316, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  fogType: 6
+  fogMin: 5
+  fogMax: 15
+  _fogDepth: 10
+  secFogMin: 0
+  secFogMax: 1
+  worldSize: {x: 1000, y: 30, z: 500}
+  fogFalloffType: 0
+  fogFalloffCurve: 1
+  sortingLayer: Default
+  sortingOrder: 0
+  renderingLayerMask: 4294967295
+  fogColor: {r: 0.9056602, g: 0.551289, b: 0.3332145, a: 0.83137256}
+  blendType: 0
+  fogMeshType: 0
+  customMesh: {fileID: 0}
+  fogClipping: 0
+  renderMode: 1
+  affectedByLights: 0
+  lightScatteringFactor: 0.35
+  lightReflectivity: 0.5
+  lightTransmission: 0.5

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

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

+ 316 - 2
Assets/Scenes/testCombat.scene

@@ -2264,6 +2264,10 @@ PrefabInstance:
       propertyPath: levelBattleId
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 6090200664286961698, guid: 1076536f8fdf47942aa287592c6a8b19, type: 3}
+      propertyPath: testSenceName
+      value: 
+      objectReference: {fileID: 0}
     - target: {fileID: 6090200664286961698, guid: 1076536f8fdf47942aa287592c6a8b19, type: 3}
       propertyPath: zhanZhuangTime
       value: 200
@@ -2314,7 +2318,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 6090200664286961698, guid: 1076536f8fdf47942aa287592c6a8b19, type: 3}
       propertyPath: myHeroInfo.Array.data[0].level
-      value: 300
+      value: 100
       objectReference: {fileID: 0}
     - target: {fileID: 6090200664286961698, guid: 1076536f8fdf47942aa287592c6a8b19, type: 3}
       propertyPath: myHeroInfo.Array.data[1].level
@@ -2330,7 +2334,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 6090200664286961698, guid: 1076536f8fdf47942aa287592c6a8b19, type: 3}
       propertyPath: enemyHeroInfo.Array.data[0].level
-      value: 300
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 6090200664286961698, guid: 1076536f8fdf47942aa287592c6a8b19, type: 3}
       propertyPath: enemyHeroInfo.Array.data[1].level
@@ -9781,6 +9785,67 @@ Transform:
   - {fileID: 612158947}
   m_Father: {fileID: 1902930422}
   m_LocalEulerAnglesHint: {x: 0, y: 190, z: 0}
+--- !u!1001 &1482512349
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    serializedVersion: 3
+    m_TransformParent: {fileID: 0}
+    m_Modifications:
+    - target: {fileID: 4999576555796739584, guid: 96fc37aadb9bc8840ad5fa98172cd16f, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 23.3
+      objectReference: {fileID: 0}
+    - target: {fileID: 4999576555796739584, guid: 96fc37aadb9bc8840ad5fa98172cd16f, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: -2.7
+      objectReference: {fileID: 0}
+    - target: {fileID: 4999576555796739584, guid: 96fc37aadb9bc8840ad5fa98172cd16f, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: -57.1
+      objectReference: {fileID: 0}
+    - target: {fileID: 4999576555796739584, guid: 96fc37aadb9bc8840ad5fa98172cd16f, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 0.9295193
+      objectReference: {fileID: 0}
+    - target: {fileID: 4999576555796739584, guid: 96fc37aadb9bc8840ad5fa98172cd16f, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4999576555796739584, guid: 96fc37aadb9bc8840ad5fa98172cd16f, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: -0.36877355
+      objectReference: {fileID: 0}
+    - target: {fileID: 4999576555796739584, guid: 96fc37aadb9bc8840ad5fa98172cd16f, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4999576555796739584, guid: 96fc37aadb9bc8840ad5fa98172cd16f, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4999576555796739584, guid: 96fc37aadb9bc8840ad5fa98172cd16f, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: -43.28
+      objectReference: {fileID: 0}
+    - target: {fileID: 4999576555796739584, guid: 96fc37aadb9bc8840ad5fa98172cd16f, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5829875553534260591, guid: 96fc37aadb9bc8840ad5fa98172cd16f, type: 3}
+      propertyPath: m_Name
+      value: Mountain01 yaodu
+      objectReference: {fileID: 0}
+    - target: {fileID: 5829875553534260591, guid: 96fc37aadb9bc8840ad5fa98172cd16f, type: 3}
+      propertyPath: m_IsActive
+      value: 0
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+    m_RemovedGameObjects: []
+    m_AddedGameObjects: []
+    m_AddedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: 96fc37aadb9bc8840ad5fa98172cd16f, type: 3}
 --- !u!224 &1490985506 stripped
 RectTransform:
   m_CorrespondingSourceObject: {fileID: 1365871677352826847, guid: d960809b72afef9438f8c29c8949a1ff, type: 3}
@@ -13239,6 +13304,67 @@ PrefabInstance:
     m_AddedGameObjects: []
     m_AddedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 9e7a1f1f33f8f5b44aa99d244e38770f, type: 3}
+--- !u!1001 &2960112896216046657
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    serializedVersion: 3
+    m_TransformParent: {fileID: 0}
+    m_Modifications:
+    - target: {fileID: 411656382419835695, guid: cdcc1e72df788f34092ee9d092668bbf, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 411656382419835695, guid: cdcc1e72df788f34092ee9d092668bbf, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 411656382419835695, guid: cdcc1e72df788f34092ee9d092668bbf, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 46.8
+      objectReference: {fileID: 0}
+    - target: {fileID: 411656382419835695, guid: cdcc1e72df788f34092ee9d092668bbf, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 411656382419835695, guid: cdcc1e72df788f34092ee9d092668bbf, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 411656382419835695, guid: cdcc1e72df788f34092ee9d092668bbf, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 411656382419835695, guid: cdcc1e72df788f34092ee9d092668bbf, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 411656382419835695, guid: cdcc1e72df788f34092ee9d092668bbf, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 411656382419835695, guid: cdcc1e72df788f34092ee9d092668bbf, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 411656382419835695, guid: cdcc1e72df788f34092ee9d092668bbf, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8291995275029873607, guid: cdcc1e72df788f34092ee9d092668bbf, type: 3}
+      propertyPath: m_Name
+      value: fukong dao4
+      objectReference: {fileID: 0}
+    - target: {fileID: 8291995275029873607, guid: cdcc1e72df788f34092ee9d092668bbf, type: 3}
+      propertyPath: m_IsActive
+      value: 0
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+    m_RemovedGameObjects: []
+    m_AddedGameObjects: []
+    m_AddedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: cdcc1e72df788f34092ee9d092668bbf, type: 3}
 --- !u!1001 &3837448494345457648
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -13846,6 +13972,67 @@ PrefabInstance:
     m_AddedGameObjects: []
     m_AddedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: dfc9c6d000d7eff4fb00d1ab747832f3, type: 3}
+--- !u!1001 &6160578412970070858
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    serializedVersion: 3
+    m_TransformParent: {fileID: 0}
+    m_Modifications:
+    - target: {fileID: 354955946429195138, guid: 77e0e1e49e343a4488ae529b0fecc739, type: 3}
+      propertyPath: m_Name
+      value: fukong dao2
+      objectReference: {fileID: 0}
+    - target: {fileID: 354955946429195138, guid: 77e0e1e49e343a4488ae529b0fecc739, type: 3}
+      propertyPath: m_IsActive
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6531860447979389797, guid: 77e0e1e49e343a4488ae529b0fecc739, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6531860447979389797, guid: 77e0e1e49e343a4488ae529b0fecc739, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6531860447979389797, guid: 77e0e1e49e343a4488ae529b0fecc739, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6531860447979389797, guid: 77e0e1e49e343a4488ae529b0fecc739, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 6531860447979389797, guid: 77e0e1e49e343a4488ae529b0fecc739, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6531860447979389797, guid: 77e0e1e49e343a4488ae529b0fecc739, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6531860447979389797, guid: 77e0e1e49e343a4488ae529b0fecc739, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6531860447979389797, guid: 77e0e1e49e343a4488ae529b0fecc739, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6531860447979389797, guid: 77e0e1e49e343a4488ae529b0fecc739, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6531860447979389797, guid: 77e0e1e49e343a4488ae529b0fecc739, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+    m_RemovedGameObjects: []
+    m_AddedGameObjects: []
+    m_AddedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: 77e0e1e49e343a4488ae529b0fecc739, type: 3}
 --- !u!1001 &6425123862439900028
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -14220,6 +14407,128 @@ PrefabInstance:
     m_AddedGameObjects: []
     m_AddedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 94735755483cf4648bc00bc50f2c7cd2, type: 3}
+--- !u!1001 &9136575265582076979
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    serializedVersion: 3
+    m_TransformParent: {fileID: 0}
+    m_Modifications:
+    - target: {fileID: 198328406000524784, guid: 744c0198a67de6e4b8441611f04705c0, type: 3}
+      propertyPath: m_Name
+      value: LevelBattle03
+      objectReference: {fileID: 0}
+    - target: {fileID: 198328406000524784, guid: 744c0198a67de6e4b8441611f04705c0, type: 3}
+      propertyPath: m_IsActive
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8361006489289187437, guid: 744c0198a67de6e4b8441611f04705c0, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8361006489289187437, guid: 744c0198a67de6e4b8441611f04705c0, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8361006489289187437, guid: 744c0198a67de6e4b8441611f04705c0, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8361006489289187437, guid: 744c0198a67de6e4b8441611f04705c0, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 8361006489289187437, guid: 744c0198a67de6e4b8441611f04705c0, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8361006489289187437, guid: 744c0198a67de6e4b8441611f04705c0, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8361006489289187437, guid: 744c0198a67de6e4b8441611f04705c0, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8361006489289187437, guid: 744c0198a67de6e4b8441611f04705c0, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8361006489289187437, guid: 744c0198a67de6e4b8441611f04705c0, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8361006489289187437, guid: 744c0198a67de6e4b8441611f04705c0, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+    m_RemovedGameObjects: []
+    m_AddedGameObjects: []
+    m_AddedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: 744c0198a67de6e4b8441611f04705c0, type: 3}
+--- !u!1001 &9207637091369693197
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    serializedVersion: 3
+    m_TransformParent: {fileID: 0}
+    m_Modifications:
+    - target: {fileID: 4160862028817849242, guid: 0685c296e9c07cd498a8a553f623bebe, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4160862028817849242, guid: 0685c296e9c07cd498a8a553f623bebe, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: -5.9
+      objectReference: {fileID: 0}
+    - target: {fileID: 4160862028817849242, guid: 0685c296e9c07cd498a8a553f623bebe, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: -61.7
+      objectReference: {fileID: 0}
+    - target: {fileID: 4160862028817849242, guid: 0685c296e9c07cd498a8a553f623bebe, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 4160862028817849242, guid: 0685c296e9c07cd498a8a553f623bebe, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4160862028817849242, guid: 0685c296e9c07cd498a8a553f623bebe, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4160862028817849242, guid: 0685c296e9c07cd498a8a553f623bebe, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4160862028817849242, guid: 0685c296e9c07cd498a8a553f623bebe, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4160862028817849242, guid: 0685c296e9c07cd498a8a553f623bebe, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4160862028817849242, guid: 0685c296e9c07cd498a8a553f623bebe, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8855316551847403815, guid: 0685c296e9c07cd498a8a553f623bebe, type: 3}
+      propertyPath: m_Name
+      value: fukong dao3
+      objectReference: {fileID: 0}
+    - target: {fileID: 8855316551847403815, guid: 0685c296e9c07cd498a8a553f623bebe, type: 3}
+      propertyPath: m_IsActive
+      value: 0
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+    m_RemovedGameObjects: []
+    m_AddedGameObjects: []
+    m_AddedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: 0685c296e9c07cd498a8a553f623bebe, type: 3}
 --- !u!1660057539 &9223372036854775807
 SceneRoots:
   m_ObjectHideFlags: 0
@@ -14268,3 +14577,8 @@ SceneRoots:
   - {fileID: 6425123862439900028}
   - {fileID: 1444228855}
   - {fileID: 722841957}
+  - {fileID: 6160578412970070858}
+  - {fileID: 9207637091369693197}
+  - {fileID: 2960112896216046657}
+  - {fileID: 9136575265582076979}
+  - {fileID: 1482512349}

+ 1 - 1
Assets/Scripts/GameLogic/Combat/CombatTool/CombatController.cs

@@ -91,7 +91,7 @@ namespace GameLogic.Combat.CombatTool
                 if (CombatSenceController == null)
                 {
                     CombatSenceController = new CombatSenceController();
-                    await CombatSenceController.InitScenes();
+                    await CombatSenceController.InitScenes(startCombatInfo.levelBattleId);
                 }
 
                 if (CombatDataController == null)

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

@@ -2,6 +2,7 @@ using System;
 using System.Collections.Generic;
 using Common.Utility.CombatEvent;
 using Core.Utility;
+using Excel2Json;
 using Fort23.Core;
 using Fort23.UTool;
 using GameLogic.Combat.CombatTool.SceneTool;
@@ -32,7 +33,9 @@ namespace GameLogic.Combat.CombatTool
         // protected GameObjectPool ShengShiQiuTi;
 
         private float shengShiStartSize = 3;
+
         private float shengShiEndSize = 300;
+
         // private float _shengShiAddTime;
         private bool _isUpdateShengShi;
 
@@ -41,20 +44,37 @@ namespace GameLogic.Combat.CombatTool
         // private RandomAllMap RandomAllMap;
 
         private float shengShiRan;
+
         // private List
-        public async CTask InitScenes()
+        public async CTask InitScenes(int levelBattleId)
         {
             GameObject gameObject = new GameObject("mvoeRoot");
+            string sceneName = "LevelBattle03";
+            LevelbattleConfig levelbattleConfig = ConfigComponent.Instance.Get<LevelbattleConfig>(levelBattleId);
+            if (levelbattleConfig.ID > 0)
+            {
+                //sceneName= levelbattleConfig.sceneName;
+            }
+#if UNITY_EDITOR
+            TestCombatHeroConfig testCombatHeroConfig = GameObject.FindObjectOfType<TestCombatHeroConfig>();
+            if (testCombatHeroConfig != null)
+            {
+                if (!string.IsNullOrEmpty(testCombatHeroConfig.testSenceName))
+                {
+                    sceneName = testCombatHeroConfig.testSenceName;
+                }
+            }
 
+#endif
             moveRoot = gameObject.transform;
             CTaskAwaitBuffer cTaskAwaitBuffer = new CTaskAwaitBuffer();
 
-            var task_a = AssetBundleLoadManager.Instance.LoadAssetAsyncTask<GameObject>("LevelBattle01.prefab",
+            var task_a = AssetBundleLoadManager.Instance.LoadAssetAsyncTask<GameObject>(sceneName + ".prefab",
                 delegate(AssetHandle assetHandle)
                 {
                     GameObject gameObject = assetHandle.AssetObject<GameObject>();
                     SceneMonoConfig = gameObject.GetComponent<SceneMonoConfigBasic>();
-                    SceneMonoConfig.shengShiMaterial.SetFloat(Ran,0.1f); 
+                    SceneMonoConfig.shengShiMaterial.SetFloat(Ran, 0.1f);
                 });
             cTaskAwaitBuffer.AddTask(task_a);
 
@@ -66,7 +86,7 @@ namespace GameLogic.Combat.CombatTool
             lasetPos = new Vector3(0, 20, 0);
             await cTaskAwaitBuffer.WaitAll();
             currBesselPath = InitBesselPath(lasetPos);
-            SceneMonoConfig.Init(Camera.main.transform.parent,moveRoot);
+            SceneMonoConfig.Init(Camera.main.transform.parent, moveRoot);
             // RandomAllMap = new RandomAllMap();
             // RandomAllMap.Init(moveRoot, SceneMonoConfig);
             // RandomAllMap.Update();
@@ -296,14 +316,14 @@ namespace GameLogic.Combat.CombatTool
         public void StartPayShengShi(Transform root)
         {
             shengShiRan = 1;
-            SceneMonoConfig.shengShiMaterial.SetFloat(Ran,shengShiRan); 
-           Vector3 pos= CombatController.currActiveCombat.playerHeroEntity.dotPos - CombatController.currActiveCombat
+            SceneMonoConfig.shengShiMaterial.SetFloat(Ran, shengShiRan);
+            Vector3 pos = CombatController.currActiveCombat.playerHeroEntity.dotPos - CombatController.currActiveCombat
                 .CombatCameraControllder.Camera.transform.position;
-           pos.z = -30;
-           SceneMonoConfig.shengShiMaterial.SetVector(Pos,pos); 
-           
+            pos.z = -30;
+            SceneMonoConfig.shengShiMaterial.SetVector(Pos, pos);
+
             _isUpdateShengShi = true;
-        
+
             // _shengShiAddTime = 0;
         }
 
@@ -320,19 +340,18 @@ namespace GameLogic.Combat.CombatTool
                 NextBesselPath.Update(t);
             }
 
-            
 
             if (_isUpdateShengShi)
             {
                 // _shengShiAddTime += t * 1f;
                 shengShiRan += t * 150;
-                SceneMonoConfig.shengShiMaterial.SetFloat(Ran,shengShiRan); 
+                SceneMonoConfig.shengShiMaterial.SetFloat(Ran, shengShiRan);
                 // float v = Mathf.Lerp(shengShiStartSize, shengShiEndSize, _shengShiAddTime);
                 // ShengShiQiuTi.own.transform.localScale = Vector3.one * v;
                 if (shengShiRan >= 200)
                 {
-                    SceneMonoConfig.shengShiMaterial.SetFloat(Ran,0.1f); 
-                    
+                    SceneMonoConfig.shengShiMaterial.SetFloat(Ran, 0.1f);
+
                     _isUpdateShengShi = false;
                 }
             }

+ 13 - 12
Assets/Scripts/GameLogic/Combat/CombatTool/SceneTool/SceneCJ2MonoConfig.cs

@@ -17,15 +17,13 @@ namespace GameLogic.Combat.CombatTool.SceneTool
 
         protected override void ProInit()
         {
-            RenderSettings.fogColor= fogColor;
+            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();)
@@ -36,7 +34,7 @@ namespace GameLogic.Combat.CombatTool.SceneTool
                 }
 
                 Vector3 objetcPos = _allGameObjectPools.Value.own.transform.position;
-                if (Vector3.Distance(pos, objetcPos) > 600)
+                if (Vector3.Distance(pos, objetcPos) > 1600)
                 {
                     removeKey.Add(_allGameObjectPools.Key);
                     GObjectPool.Instance.Recycle(_allGameObjectPools.Value);
@@ -59,7 +57,7 @@ namespace GameLogic.Combat.CombatTool.SceneTool
                 }
 
                 Vector3 objetcPos = _downAllGameObjectPools.Value.own.transform.position;
-                if (Vector3.Distance(pos, objetcPos) > 600)
+                if (Vector3.Distance(pos, objetcPos) > 1600)
                 {
                     removeKey.Add(_downAllGameObjectPools.Key);
                     GObjectPool.Instance.Recycle(_downAllGameObjectPools.Value);
@@ -77,7 +75,7 @@ namespace GameLogic.Combat.CombatTool.SceneTool
             int z = (int)(pos.z / radius);
             float xStartInit = x;
             float zStartInit = z;
-            for (int i = -4; i <= 20; i++)
+            for (int i = -4; i <= 10; i++)
             {
                 for (int j = -4; j <= 20; j++)
                 {
@@ -107,6 +105,7 @@ namespace GameLogic.Combat.CombatTool.SceneTool
                 float ry = Random.Range(0, 360);
                 Vector3 eulerAngles = gameObjectPool.own.transform.eulerAngles;
                 gameObjectPool.own.transform.eulerAngles = new Vector3(eulerAngles.x, ry, eulerAngles.z);
+                gameObjectPool.own.transform.localScale = Vector3.one * 1.5f;
             }
 
             _allGameObjectPools.Add(key, gameObjectPool);
@@ -120,23 +119,25 @@ namespace GameLogic.Combat.CombatTool.SceneTool
             }
 
             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)
+                float y = Random.Range(-10.0f, 1.0f);
+                int d = Mathf.Abs(Mathf.Abs(xintdex) - 1);
+                if (d <= 1)
                 {
-                     y = Random.Range(-1.0f, 1.0f);
+                    y = Random.Range(-10.0f - d * 10, -5.0f - d * 10);
                 }
-               
+
                 float x = Random.Range(-3.0f, 3.0f);
-                float z = Random.Range(-2.0f, 2.0f);
+                float z = Random.Range(-3.0f, 3.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);
+                gameObjectPool.own.transform.localScale = Vector3.one;
             }
 
             _downAllGameObjectPools.Add(key, gameObjectPool);

+ 9 - 4
Assets/Scripts/GameLogic/Combat/CombatTool/SceneTool/SceneMonoConfig.cs

@@ -36,7 +36,7 @@ namespace GameLogic.Combat.CombatTool.SceneTool
             for (_allGameObjectPools.Begin(); _allGameObjectPools.Next();)
             {
                 Vector3 objetcPos = _allGameObjectPools.Value.own.transform.position;
-                if (Vector3.Distance(pos, objetcPos) > 300)
+                if (Vector3.Distance(pos, objetcPos) > 1600)
                 {
                     removeKey.Add(_allGameObjectPools.Key);
                     GObjectPool.Instance.Recycle(_allGameObjectPools.Value);
@@ -55,9 +55,9 @@ namespace GameLogic.Combat.CombatTool.SceneTool
             int z = (int)(pos.z / radius);
             float xStartInit = x;
             float zStartInit = z;
-            for (int i = -3; i <= 3; i++)
+            for (int i = -15; i <= 15; i++)
             {
-                for (int j = -3; j <= 4; j++)
+                for (int j = -15; j <= 15; j++)
                 {
                     // if (i == 0 && j == 0)
                     // {
@@ -74,7 +74,12 @@ namespace GameLogic.Combat.CombatTool.SceneTool
 
                     GameObjectPool gameObjectPool = GetObejct();
                     float y = Random.Range(-2, 0);
-                    gameObjectPool.own.transform.position = new Vector3(currX, y, currZ);
+                    float xoff = Random.Range(-3.0f, 3.0f);
+                    float zoff = Random.Range(-2.0f, 2.0f);
+                    gameObjectPool.own.transform.position = new Vector3(currX+xoff, y, currZ+zoff);
+                    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);
                 }
             }

+ 1 - 0
Assets/Scripts/GameLogic/Combat/CombatType/StartCombatInfo.cs

@@ -8,5 +8,6 @@
         /// 是否显示战斗结算ui 挂机事件不显示
         /// </summary>
         public bool isCombatOverUi;
+  
     }
 }

+ 1 - 1
Assets/Scripts/GameLogic/CombatScenesTool/TestCombatHeroConfig.cs

@@ -71,6 +71,6 @@ namespace GameLogic.CombatScenesTool
         [Header("测试的怪物等级")]  public int enemyLevel;
         [Header("是否站桩")] public bool isZhanZhuang;
         [Header("站桩时间")] public float zhanZhuangTime;
-        
+        [Header("测试场景名字")] public string testSenceName;
     }
 }

Filskillnaden har hållts tillbaka eftersom den är för stor
+ 0 - 0
Assets/StreamingAssets/assetConfig.txt


+ 4 - 4
UserSettings/EditorUserSettings.asset

@@ -39,16 +39,16 @@ EditorUserSettings:
       value: 50030c5e500c58580e5d5c71457a0e44124f4d78292e7434787b1e36b2b4323a
       flags: 0
     RecentlyUsedSceneGuid-6:
-      value: 5753045f5d005b5f0b0a082315715d44464e4b7b797125622e284430bbe66d68
+      value: 53520353570c0b5d0c5a0d2141755e44104e4a297d7c7762792d4a61bbb6613c
       flags: 0
     RecentlyUsedSceneGuid-7:
-      value: 53520353570c0b5d0c5a0d2141755e44104e4a297d7c7762792d4a61bbb6613c
+      value: 525456020100515e5d5f087145710844404f1c797d2e7262752d4b67b0b6373e
       flags: 0
     RecentlyUsedSceneGuid-8:
-      value: 52570c02000d5e025a58597212725c4440161c2e797a75607f2c4467b7b3323e
+      value: 5753045f5d005b5f0b0a082315715d44464e4b7b797125622e284430bbe66d68
       flags: 0
     RecentlyUsedSceneGuid-9:
-      value: 525456020100515e5d5f087145710844404f1c797d2e7262752d4b67b0b6373e
+      value: 52570c02000d5e025a58597212725c4440161c2e797a75607f2c4467b7b3323e
       flags: 0
     Systems Window:
       value: 183b144645154b7802000a2b17364d11021e17246e72662b47695d73a2a07478a2a505e1e82d6f2f100cca3210371526d1051c05e22a040f2507f00b32f01c061ccb5a9f5ace1e10d81c50a48d5d91a3959694aa9ad8efd7c9f2afe0f1c0fcfdf6f8b6f2a5a6dacfb89debbfa1cbc9c3f5c3bac18e9c89c1bbdec2d6f2b992939996c59699c79ae8d182b7baad82aba0b0aea88398abdbf1dd8a8ea765ffc520262728fafcf8f6c28eb162945c71898d6167877a72a980809c9f71cecece859d579fd5f106dbdadb21de0dde237c686c76706641634c764f547c624a7e622d6628286620686f653d2b635a0204003e0805017509093043470e3643041c5d5b415c54450e1c424b420f6e4b634e636263696655641a1f273c0f083c1102ec362de62318e9ea25ab61ade8ed0ee30655b0b6b7b8176615

+ 131 - 131
UserSettings/Layouts/default-2022.dwlt

@@ -14,12 +14,12 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   m_PixelRect:
     serializedVersion: 2
-    x: 3051
-    y: 745
-    width: 825
-    height: 618
+    x: 2170.0002
+    y: 749.50006
+    width: 825.0001
+    height: 613.50006
   m_ShowMode: 0
-  m_Title: Console
+  m_Title: "\u63A7\u5236\u53F0"
   m_RootView: {fileID: 4}
   m_MinSize: {x: 100, y: 121}
   m_MaxSize: {x: 4000, y: 4021}
@@ -39,11 +39,11 @@ MonoBehaviour:
   m_PixelRect:
     serializedVersion: 2
     x: 0
-    y: 43
-    width: 2560
-    height: 1349
+    y: 32.000004
+    width: 1920.0002
+    height: 1012.0001
   m_ShowMode: 4
-  m_Title: Inspector
+  m_Title: "\u68C0\u67E5\u5668"
   m_RootView: {fileID: 6}
   m_MinSize: {x: 875, y: 371}
   m_MaxSize: {x: 10000, y: 10000}
@@ -65,8 +65,8 @@ MonoBehaviour:
     serializedVersion: 2
     x: 0
     y: 0
-    width: 825
-    height: 618
+    width: 825.00006
+    height: 613.50006
   m_MinSize: {x: 100, y: 121}
   m_MaxSize: {x: 4000, y: 4021}
   m_ActualView: {fileID: 15}
@@ -92,12 +92,12 @@ MonoBehaviour:
     serializedVersion: 2
     x: 0
     y: 0
-    width: 825
-    height: 618
+    width: 825.00006
+    height: 613.50006
   m_MinSize: {x: 100, y: 121}
   m_MaxSize: {x: 4000, y: 4021}
   vertical: 0
-  controlID: 1887
+  controlID: 18
   draggingID: 0
 --- !u!114 &5
 MonoBehaviour:
@@ -115,9 +115,9 @@ MonoBehaviour:
   m_Position:
     serializedVersion: 2
     x: 0
-    y: 904
-    width: 587
-    height: 395
+    y: 386.00003
+    width: 485.00006
+    height: 576
   m_MinSize: {x: 232, y: 271}
   m_MaxSize: {x: 10002, y: 10021}
   m_ActualView: {fileID: 22}
@@ -147,8 +147,8 @@ MonoBehaviour:
     serializedVersion: 2
     x: 0
     y: 0
-    width: 2560
-    height: 1349
+    width: 1920.0001
+    height: 1012.00006
   m_MinSize: {x: 875, y: 300}
   m_MaxSize: {x: 10000, y: 10000}
   m_UseTopView: 1
@@ -172,7 +172,7 @@ MonoBehaviour:
     serializedVersion: 2
     x: 0
     y: 0
-    width: 2560
+    width: 1920.0001
     height: 30
   m_MinSize: {x: 0, y: 0}
   m_MaxSize: {x: 0, y: 0}
@@ -193,8 +193,8 @@ MonoBehaviour:
   m_Position:
     serializedVersion: 2
     x: 0
-    y: 1329
-    width: 2560
+    y: 992.00006
+    width: 1920.0001
     height: 20
   m_MinSize: {x: 0, y: 0}
   m_MaxSize: {x: 0, y: 0}
@@ -219,12 +219,12 @@ MonoBehaviour:
     serializedVersion: 2
     x: 0
     y: 30
-    width: 2560
-    height: 1299
+    width: 1920.0001
+    height: 962.00006
   m_MinSize: {x: 400, y: 100}
   m_MaxSize: {x: 32384, y: 16192}
   vertical: 0
-  controlID: 193
+  controlID: 79
   draggingID: 0
 --- !u!114 &10
 MonoBehaviour:
@@ -243,10 +243,10 @@ MonoBehaviour:
     serializedVersion: 2
     x: 0
     y: 0
-    width: 950
-    height: 1299
-  m_MinSize: {x: 200, y: 200}
-  m_MaxSize: {x: 4000, y: 4000}
+    width: 712.50006
+    height: 962.00006
+  m_MinSize: {x: 201, y: 221}
+  m_MaxSize: {x: 4001, y: 4021}
   m_ActualView: {fileID: 18}
   m_Panes:
   - {fileID: 18}
@@ -269,14 +269,14 @@ MonoBehaviour:
   - {fileID: 5}
   m_Position:
     serializedVersion: 2
-    x: 950
+    x: 712.50006
     y: 0
-    width: 587
-    height: 1299
+    width: 485.00006
+    height: 962.00006
   m_MinSize: {x: 100, y: 100}
   m_MaxSize: {x: 8096, y: 16192}
   vertical: 1
-  controlID: 54
+  controlID: 80
   draggingID: 0
 --- !u!114 &12
 MonoBehaviour:
@@ -295,10 +295,10 @@ MonoBehaviour:
     serializedVersion: 2
     x: 0
     y: 0
-    width: 587
-    height: 904
-  m_MinSize: {x: 200, y: 200}
-  m_MaxSize: {x: 4000, y: 4000}
+    width: 485.00006
+    height: 386.00003
+  m_MinSize: {x: 202, y: 221}
+  m_MaxSize: {x: 4002, y: 4021}
   m_ActualView: {fileID: 19}
   m_Panes:
   - {fileID: 19}
@@ -319,12 +319,12 @@ MonoBehaviour:
   m_Children: []
   m_Position:
     serializedVersion: 2
-    x: 1537
+    x: 1197.5001
     y: 0
-    width: 419
-    height: 1299
-  m_MinSize: {x: 200, y: 200}
-  m_MaxSize: {x: 4000, y: 4000}
+    width: 286.5
+    height: 962.00006
+  m_MinSize: {x: 202, y: 221}
+  m_MaxSize: {x: 4002, y: 4021}
   m_ActualView: {fileID: 21}
   m_Panes:
   - {fileID: 21}
@@ -345,10 +345,10 @@ MonoBehaviour:
   m_Children: []
   m_Position:
     serializedVersion: 2
-    x: 1956
+    x: 1484.0001
     y: 0
-    width: 604
-    height: 1299
+    width: 436
+    height: 962.00006
   m_MinSize: {x: 275, y: 50}
   m_MaxSize: {x: 4000, y: 4000}
   m_ActualView: {fileID: 23}
@@ -372,15 +372,15 @@ MonoBehaviour:
   m_MinSize: {x: 100, y: 100}
   m_MaxSize: {x: 4000, y: 4000}
   m_TitleContent:
-    m_Text: Console
-    m_Image: {fileID: -4327648978806127646, guid: 0000000000000000d000000000000000, type: 0}
+    m_Text: "\u63A7\u5236\u53F0"
+    m_Image: {fileID: -4950941429401207979, guid: 0000000000000000d000000000000000, type: 0}
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 3051
-    y: 745
-    width: 825
-    height: 597
+    x: 2170.0002
+    y: 749.50006
+    width: 825.00006
+    height: 592.50006
   m_SerializedDataModeController:
     m_DataMode: 0
     m_PreferredDataMode: 0
@@ -406,8 +406,8 @@ MonoBehaviour:
   m_MinSize: {x: 390, y: 390}
   m_MaxSize: {x: 4000, y: 4000}
   m_TitleContent:
-    m_Text: Lighting
-    m_Image: {fileID: -1347227620855488341, guid: 0000000000000000d000000000000000, type: 0}
+    m_Text: "\u7167\u660E"
+    m_Image: {fileID: -1477008817101679558, guid: 0000000000000000d000000000000000, type: 0}
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
@@ -440,8 +440,8 @@ MonoBehaviour:
   m_MinSize: {x: 100, y: 100}
   m_MaxSize: {x: 4000, y: 4000}
   m_TitleContent:
-    m_Text: Animator
-    m_Image: {fileID: -1673928668082335149, guid: 0000000000000000d000000000000000, type: 0}
+    m_Text: "\u52A8\u753B\u5668"
+    m_Image: {fileID: 1711060831702674872, guid: 0000000000000000d000000000000000, type: 0}
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
@@ -544,15 +544,15 @@ MonoBehaviour:
   m_MinSize: {x: 200, y: 200}
   m_MaxSize: {x: 4000, y: 4000}
   m_TitleContent:
-    m_Text: Game
-    m_Image: {fileID: -6423792434712278376, guid: 0000000000000000d000000000000000, type: 0}
+    m_Text: "\u6E38\u620F"
+    m_Image: {fileID: 4621777727084837110, guid: 0000000000000000d000000000000000, type: 0}
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
     x: 0
-    y: 19
-    width: 949
-    height: 1278
+    y: 62.000008
+    width: 711.50006
+    height: 941.00006
   m_SerializedDataModeController:
     m_DataMode: 0
     m_PreferredDataMode: 0
@@ -584,10 +584,10 @@ MonoBehaviour:
     m_VRangeLocked: 0
     hZoomLockedByDefault: 0
     vZoomLockedByDefault: 0
-    m_HBaseRangeMin: -375
-    m_HBaseRangeMax: 375
-    m_VBaseRangeMin: -812
-    m_VBaseRangeMax: 812
+    m_HBaseRangeMin: -187.50002
+    m_HBaseRangeMax: 187.50002
+    m_VBaseRangeMin: -406.00006
+    m_VBaseRangeMax: 406.00006
     m_HAllowExceedBaseRangeMin: 1
     m_HAllowExceedBaseRangeMax: 1
     m_VAllowExceedBaseRangeMin: 1
@@ -605,23 +605,23 @@ MonoBehaviour:
       serializedVersion: 2
       x: 0
       y: 21
-      width: 949
-      height: 1257
-    m_Scale: {x: 0.7740148, y: 0.7740148}
-    m_Translation: {x: 474.5, y: 628.5}
+      width: 711.50006
+      height: 920.00006
+    m_Scale: {x: 1, y: 1}
+    m_Translation: {x: 355.75003, y: 460.00003}
     m_MarginLeft: 0
     m_MarginRight: 0
     m_MarginTop: 0
     m_MarginBottom: 0
     m_LastShownAreaInsideMargins:
       serializedVersion: 2
-      x: -613.0374
-      y: -812
-      width: 1226.0748
-      height: 1624
+      x: -355.75003
+      y: -460.00003
+      width: 711.50006
+      height: 920.00006
     m_MinimalGUI: 1
-  m_defaultScale: 0.7740148
-  m_LastWindowPixelSize: {x: 949, y: 1278}
+  m_defaultScale: 1
+  m_LastWindowPixelSize: {x: 1423, y: 1882}
   m_ClearInEditMode: 1
   m_NoCameraWarning: 1
   m_LowResolutionForAspectRatios: 01000001000000000000
@@ -642,15 +642,15 @@ MonoBehaviour:
   m_MinSize: {x: 200, y: 200}
   m_MaxSize: {x: 4000, y: 4000}
   m_TitleContent:
-    m_Text: Scene
-    m_Image: {fileID: 2593428753322112591, guid: 0000000000000000d000000000000000, type: 0}
+    m_Text: "\u573A\u666F"
+    m_Image: {fileID: 8634526014445323508, guid: 0000000000000000d000000000000000, type: 0}
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 1
-    y: 19
-    width: 585
-    height: 883
+    x: 712.50006
+    y: 62.000008
+    width: 483.00006
+    height: 365.00003
   m_SerializedDataModeController:
     m_DataMode: 0
     m_PreferredDataMode: 0
@@ -991,7 +991,7 @@ MonoBehaviour:
       collapsed: 0
       displayed: 0
       snapOffset: {x: -231.00003, y: -145.00003}
-      snapOffsetDelta: {x: 0, y: 0.000030517578}
+      snapOffsetDelta: {x: 0, y: 0}
       snapCorner: 3
       id: Scene View/TrailRenderer
       index: 10
@@ -1026,18 +1026,18 @@ MonoBehaviour:
       sizeOverriden: 0
     m_OverlaysVisible: 1
   m_WindowGUID: 3de2bc164a2229345aaffb3c6f51b287
-  m_Gizmos: 0
+  m_Gizmos: 1
   m_OverrideSceneCullingMask: 6917529027641081856
   m_SceneIsLit: 1
   m_SceneLighting: 1
-  m_2DMode: 0
+  m_2DMode: 1
   m_isRotationLocked: 0
   m_PlayAudio: 0
   m_AudioPlay: 0
   m_Position:
-    m_Target: {x: 0.08548516, y: 21.323143, z: 26.123556}
+    m_Target: {x: 7.137906, y: 13.237203, z: -2.232632}
     speed: 2
-    m_Value: {x: 0.08548516, y: 21.323143, z: 26.123556}
+    m_Value: {x: -1.0195473, y: -0.35552552, z: 0.730846}
   m_RenderMode: 0
   m_CameraMode:
     drawMode: 0
@@ -1046,7 +1046,7 @@ MonoBehaviour:
   m_ValidateTrueMetals: 0
   m_DoValidateTrueMetals: 0
   m_SceneViewState:
-    m_AlwaysRefresh: 0
+    m_AlwaysRefresh: 1
     showFog: 1
     showSkybox: 1
     showFlares: 1
@@ -1065,9 +1065,9 @@ MonoBehaviour:
       m_Size: {x: 0, y: 0}
     yGrid:
       m_Fade:
-        m_Target: 1
+        m_Target: 0
         speed: 2
-        m_Value: 1
+        m_Value: 0
       m_Color: {r: 0.5, g: 0.5, b: 0.5, a: 0.4}
       m_Pivot: {x: 0, y: 0, z: 0}
       m_Size: {x: 1, y: 1}
@@ -1075,25 +1075,25 @@ MonoBehaviour:
       m_Fade:
         m_Target: 0
         speed: 2
-        m_Value: 0
+        m_Value: 1
       m_Color: {r: 0.5, g: 0.5, b: 0.5, a: 0.4}
       m_Pivot: {x: 0, y: 0, z: 0}
       m_Size: {x: 1, y: 1}
-    m_ShowGrid: 1
+    m_ShowGrid: 0
     m_GridAxis: 1
     m_gridOpacity: 0.5
   m_Rotation:
-    m_Target: {x: 0.23996589, y: 0.73502886, z: -0.32502934, w: 0.5449047}
+    m_Target: {x: 0, y: 0, z: 0, w: 1}
     speed: 2
-    m_Value: {x: 0.23991595, y: 0.7348759, z: -0.3249617, w: 0.54479134}
+    m_Value: {x: -0.000000010503061, y: 0.000000016772498, z: -0.0000000031780736, w: -1}
   m_Size:
-    m_Target: 6.5325136
+    m_Target: 14.875909
     speed: 2
-    m_Value: 6.5325136
+    m_Value: 0.9313644
   m_Ortho:
-    m_Target: 0
+    m_Target: 1
     speed: 2
-    m_Value: 0
+    m_Value: 1
   m_CameraSettings:
     m_Speed: 1.0646999
     m_SpeedNormalized: 0.53
@@ -1109,7 +1109,7 @@ MonoBehaviour:
     m_OcclusionCulling: 0
     m_EnableGDRP: 1
     m_BackfaceCulling: 0
-  m_LastSceneViewRotation: {x: 0.23921894, y: -0.23461083, z: 0.060340043, w: 0.9402191}
+  m_LastSceneViewRotation: {x: -0.1728984, y: 0.27610412, z: -0.052316546, w: -0.9437977}
   m_LastSceneViewOrtho: 0
   m_ReplacementShader: {fileID: 0}
   m_ReplacementString: 
@@ -1131,8 +1131,8 @@ MonoBehaviour:
   m_MinSize: {x: 100, y: 100}
   m_MaxSize: {x: 4000, y: 4000}
   m_TitleContent:
-    m_Text: Timeline
-    m_Image: {fileID: -9173288242387172643, guid: 0000000000000000d000000000000000, type: 0}
+    m_Text: "\u65F6\u95F4\u8F74"
+    m_Image: {fileID: -5401195905404635996, guid: 0000000000000000d000000000000000, type: 0}
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
@@ -1174,15 +1174,15 @@ MonoBehaviour:
   m_MinSize: {x: 200, y: 200}
   m_MaxSize: {x: 4000, y: 4000}
   m_TitleContent:
-    m_Text: Hierarchy
-    m_Image: {fileID: 7966133145522015247, guid: 0000000000000000d000000000000000, type: 0}
+    m_Text: "\u5C42\u7EA7"
+    m_Image: {fileID: -3734745235275155857, guid: 0000000000000000d000000000000000, type: 0}
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 1538
-    y: 19
-    width: 417
-    height: 1278
+    x: 1197.5001
+    y: 62.000008
+    width: 284.5
+    height: 941.00006
   m_SerializedDataModeController:
     m_DataMode: 0
     m_PreferredDataMode: 0
@@ -1198,7 +1198,7 @@ MonoBehaviour:
       scrollPos: {x: 0, y: 0}
       m_SelectedIDs: 
       m_LastClickedID: 0
-      m_ExpandedIDs: 78f4f9ff7ef4f9ffecfef9fffafef9ff64edfaff6aedfaff78faffff
+      m_ExpandedIDs: f696fdffa0b6fdffaab6fdffa8b7fdffaeb7fdffd2b7fdff50b9fdff02ddfdff1addfdff22ddfdff30ddfdff8833feff52d6feff9661ffff7efaffff
       m_RenameOverlay:
         m_UserAcceptedRename: 0
         m_Name: 
@@ -1237,15 +1237,15 @@ MonoBehaviour:
   m_MinSize: {x: 230, y: 250}
   m_MaxSize: {x: 10000, y: 10000}
   m_TitleContent:
-    m_Text: Project
-    m_Image: {fileID: -5467254957812901981, guid: 0000000000000000d000000000000000, type: 0}
+    m_Text: "\u9879\u76EE"
+    m_Image: {fileID: -5179483145760003458, guid: 0000000000000000d000000000000000, type: 0}
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 1
-    y: 923
-    width: 585
-    height: 374
+    x: 712.50006
+    y: 448.00006
+    width: 483.00006
+    height: 555
   m_SerializedDataModeController:
     m_DataMode: 0
     m_PreferredDataMode: 0
@@ -1267,7 +1267,7 @@ MonoBehaviour:
     m_SkipHidden: 0
     m_SearchArea: 1
     m_Folders:
-    - Assets/Editor
+    - Assets/Art/Environment
     m_Globs: []
     m_OriginalText: 
     m_ImportLogFlags: 0
@@ -1275,16 +1275,16 @@ MonoBehaviour:
   m_ViewMode: 1
   m_StartGridSize: 16
   m_LastFolders:
-  - Assets/Editor
+  - Assets/Art/Environment
   m_LastFoldersGridSize: 16
-  m_LastProjectPath: D:\unityProject\XiuXianGame
+  m_LastProjectPath: H:\XY002\XiuXianGame
   m_LockTracker:
     m_IsLocked: 0
   m_FolderTreeState:
     scrollPos: {x: 0, y: 0}
-    m_SelectedIDs: a8f50000
-    m_LastClickedID: 62888
-    m_ExpandedIDs: 00000000d6f20000d8f20000daf20000dcf20000def20000e0f20000e2f20000e4f20000e6f20000e8f20000eaf20000ecf20000eef20000f0f20000f2f20000f4f20000f6f20000f8f20000faf20000fcf20000fef2000000f3000002f3000004f3000006f3000008f300000af3000000ca9a3bffffff7f
+    m_SelectedIDs: 7c8b0100
+    m_LastClickedID: 101244
+    m_ExpandedIDs: 00000000b2690000668b0100688b01006a8b01006c8b01006e8b0100708b0100728b0100748b0100768b0100788b01007a8b01007c8b01007e8b0100808b0100828b0100848b0100868b0100888b01008a8b01008c8b01008e8b0100908b0100928b0100948b0100968b0100988b01009a8b01009c8b01009e8b0100a08b010000ca9a3b
     m_RenameOverlay:
       m_UserAcceptedRename: 0
       m_Name: 
@@ -1312,7 +1312,7 @@ MonoBehaviour:
     scrollPos: {x: 0, y: 0}
     m_SelectedIDs: 
     m_LastClickedID: 0
-    m_ExpandedIDs: 00000000d6f20000d8f20000daf20000dcf20000def20000e0f20000e2f20000e4f20000e6f20000e8f20000eaf20000ecf20000eef20000f0f20000f2f20000f4f20000f6f20000f8f20000faf20000fcf20000fef2000000f3000002f3000004f3000006f3000008f300000af30000
+    m_ExpandedIDs: 00000000b2690000668b0100688b01006a8b01006c8b01006e8b0100708b0100728b0100748b0100768b0100788b01007a8b01007c8b01007e8b0100808b0100828b0100848b0100868b0100888b01008a8b01008c8b01008e8b0100908b0100928b0100948b0100968b0100988b01009a8b01009c8b01009e8b0100a08b0100
     m_RenameOverlay:
       m_UserAcceptedRename: 0
       m_Name: 
@@ -1339,24 +1339,24 @@ MonoBehaviour:
   m_ListAreaState:
     m_SelectedInstanceIDs: 
     m_LastClickedInstanceID: 0
-    m_HadKeyboardFocusLastEvent: 1
+    m_HadKeyboardFocusLastEvent: 0
     m_ExpandedInstanceIDs: ccd40000ec17010052190100ae40010036aa0000bcb50000d0a9000020ba0000b402010062eb03000000000046860100ae5a010094b001004e610100a2d1010038890300a6aa0000feaa0000d2530400a4530400aa890100b68f0100c28f0100c88f0100bc8f010096f50100baf8010096f7010038f20100e2ab0000bc37010084ab00001e3a01003edf0000263a010088ab0000e4ab000070ac0000d8ab0000e0ab0000822701004427010042270100564801005cfb00000ae5000038b20400ee0a01008ac004003cb204003eb2040074b204007ab204003ab2040014b2040034b3040012b204005cb2040058b2040082d10100
     m_RenameOverlay:
       m_UserAcceptedRename: 0
-      m_Name: 
-      m_OriginalName: 
+      m_Name: cj02
+      m_OriginalName: cj02
       m_EditFieldRect:
         serializedVersion: 2
         x: 0
         y: 0
         width: 0
         height: 0
-      m_UserData: 0
+      m_UserData: 110378
       m_IsWaitingForDelay: 0
       m_IsRenaming: 0
-      m_OriginalEventType: 11
+      m_OriginalEventType: 0
       m_IsRenamingFilename: 1
-      m_ClientGUIView: {fileID: 12}
+      m_ClientGUIView: {fileID: 5}
     m_CreateAssetUtility:
       m_EndAction: {fileID: 0}
       m_InstanceID: 0
@@ -1383,15 +1383,15 @@ MonoBehaviour:
   m_MinSize: {x: 275, y: 50}
   m_MaxSize: {x: 4000, y: 4000}
   m_TitleContent:
-    m_Text: Inspector
-    m_Image: {fileID: -2667387946076563598, guid: 0000000000000000d000000000000000, type: 0}
+    m_Text: "\u68C0\u67E5\u5668"
+    m_Image: {fileID: -440750813802333266, guid: 0000000000000000d000000000000000, type: 0}
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 1957
-    y: 19
-    width: 603
-    height: 1278
+    x: 1484.0001
+    y: 62.000008
+    width: 435
+    height: 941.00006
   m_SerializedDataModeController:
     m_DataMode: 0
     m_PreferredDataMode: 0

BIN
美术/art_use_ui/daoju/icon_fb_3202.png


BIN
美术/art_use_ui/daoju/icon_fb_3203.png


BIN
美术/art_use_ui/daoju/icon_fb_3301.png


BIN
美术/art_use_ui/daoju/icon_fb_3401.png


BIN
美术/参考/功法界面 改.png


BIN
美术/参考/功法界面 调整功法.png


BIN
美术/参考/功法界面-详情 改.png


Vissa filer visades inte eftersom för många filer har ändrats