Browse Source

修改场景

李桃 1 ngày trước cách đây
mục cha
commit
36302ec8cc

+ 269 - 175
Assets/Art/Environment/cj01.prefab

@@ -29,8 +29,8 @@ Transform:
   m_GameObject: {fileID: 343516389969251701}
   serializedVersion: 2
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: -43.7, y: 0, z: 228}
-  m_LocalScale: {x: 500, y: 30, z: 1000}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 500, y: 30, z: 500}
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 4177647096219069143}
@@ -106,7 +106,7 @@ MonoBehaviour:
   _fogDepth: 15
   secFogMin: 0
   secFogMax: 1
-  worldSize: {x: 500, y: 30, z: 1000}
+  worldSize: {x: 500, y: 30, z: 500}
   fogFalloffType: 0
   fogFalloffCurve: 1
   sortingLayer: Default
@@ -122,6 +122,180 @@ MonoBehaviour:
   lightScatteringFactor: 0.35
   lightReflectivity: 0.5
   lightTransmission: 0.5
+--- !u!1 &2538985419114079488
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 4784936043935605366}
+  - component: {fileID: 3642796137574704253}
+  - component: {fileID: 1682113148526767472}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: yuanjing_huan (1)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &4784936043935605366
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2538985419114079488}
+  serializedVersion: 2
+  m_LocalRotation: {x: -0, y: -0.7071068, z: -0.7071068, w: 0}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 4177647096219069143}
+  m_LocalEulerAnglesHint: {x: -90, y: -180, z: 0}
+--- !u!33 &3642796137574704253
+MeshFilter:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2538985419114079488}
+  m_Mesh: {fileID: -951608786083511892, guid: f61d564ea9bfa194f9adebd3e1caf520, type: 3}
+--- !u!23 &1682113148526767472
+MeshRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2538985419114079488}
+  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: c9fb8078a489c764e9c5286bb9821001, 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 &4917829007436643089
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 5725328302096196011}
+  - component: {fileID: 8708739387256483342}
+  - component: {fileID: 6863308935713053380}
+  m_Layer: 0
+  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 &5725328302096196011
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4917829007436643089}
+  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: 4177647096219069143}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!33 &8708739387256483342
+MeshFilter:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4917829007436643089}
+  m_Mesh: {fileID: -6740526933416455741, guid: f8c594ef52ebfc44e98bdc02acc2a16c, type: 3}
+--- !u!23 &6863308935713053380
+MeshRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4917829007436643089}
+  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: ea038b1990cdfa742abeaa654d826674, 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 &5101112991752729148
 GameObject:
   m_ObjectHideFlags: 0
@@ -150,8 +324,8 @@ Transform:
   m_GameObject: {fileID: 5101112991752729148}
   serializedVersion: 2
   m_LocalRotation: {x: 0.7071068, y: -0, z: -0, w: 0.7071068}
-  m_LocalPosition: {x: -10.4, y: 7.1, z: 78.6}
-  m_LocalScale: {x: 179.05717, y: 179.05717, z: 179.05717}
+  m_LocalPosition: {x: 0, y: 6, z: 0}
+  m_LocalScale: {x: 400.00003, y: 400.00003, z: 400.00003}
   m_ConstrainProportionsScale: 1
   m_Children: []
   m_Father: {fileID: 4177647096219069143}
@@ -209,6 +383,93 @@ MeshRenderer:
   m_SortingLayer: 0
   m_SortingOrder: 0
   m_AdditionalVertexStreams: {fileID: 0}
+--- !u!1 &6121734615867636914
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 6899256924629427720}
+  - component: {fileID: 7498719927163939245}
+  - component: {fileID: 5761292782479023463}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: yuanjing_huan
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &6899256924629427720
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6121734615867636914}
+  serializedVersion: 2
+  m_LocalRotation: {x: -0.7071068, y: -0, z: -0, w: 0.7071068}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 4177647096219069143}
+  m_LocalEulerAnglesHint: {x: -90, y: 0, z: 0}
+--- !u!33 &7498719927163939245
+MeshFilter:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6121734615867636914}
+  m_Mesh: {fileID: -951608786083511892, guid: f61d564ea9bfa194f9adebd3e1caf520, type: 3}
+--- !u!23 &5761292782479023463
+MeshRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6121734615867636914}
+  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: c9fb8078a489c764e9c5286bb9821001, 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 &8929588464290711568
 GameObject:
   m_ObjectHideFlags: 0
@@ -234,8 +495,8 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 8929588464290711568}
   serializedVersion: 2
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 255.34705}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
@@ -243,173 +504,6 @@ Transform:
   - {fileID: 5725328302096196011}
   - {fileID: 1398171176346647818}
   - {fileID: 6899256924629427720}
+  - {fileID: 4784936043935605366}
   m_Father: {fileID: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!1001 &5259864327012369984
-PrefabInstance:
-  m_ObjectHideFlags: 0
-  serializedVersion: 2
-  m_Modification:
-    serializedVersion: 3
-    m_TransformParent: {fileID: 4177647096219069143}
-    m_Modifications:
-    - target: {fileID: -8679921383154817045, guid: a95969c8937e56046bdf6b6d3e2d1c38, type: 3}
-      propertyPath: m_LocalScale.x
-      value: 0.16372119
-      objectReference: {fileID: 0}
-    - target: {fileID: -8679921383154817045, guid: a95969c8937e56046bdf6b6d3e2d1c38, type: 3}
-      propertyPath: m_LocalScale.y
-      value: 0.16372119
-      objectReference: {fileID: 0}
-    - target: {fileID: -8679921383154817045, guid: a95969c8937e56046bdf6b6d3e2d1c38, type: 3}
-      propertyPath: m_LocalScale.z
-      value: 0.16372119
-      objectReference: {fileID: 0}
-    - target: {fileID: -8679921383154817045, guid: a95969c8937e56046bdf6b6d3e2d1c38, type: 3}
-      propertyPath: m_LocalPosition.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: -8679921383154817045, guid: a95969c8937e56046bdf6b6d3e2d1c38, type: 3}
-      propertyPath: m_LocalPosition.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: -8679921383154817045, guid: a95969c8937e56046bdf6b6d3e2d1c38, type: 3}
-      propertyPath: m_LocalPosition.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: -8679921383154817045, guid: a95969c8937e56046bdf6b6d3e2d1c38, type: 3}
-      propertyPath: m_LocalRotation.w
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: -8679921383154817045, guid: a95969c8937e56046bdf6b6d3e2d1c38, type: 3}
-      propertyPath: m_LocalRotation.x
-      value: -0
-      objectReference: {fileID: 0}
-    - target: {fileID: -8679921383154817045, guid: a95969c8937e56046bdf6b6d3e2d1c38, type: 3}
-      propertyPath: m_LocalRotation.y
-      value: -0
-      objectReference: {fileID: 0}
-    - target: {fileID: -8679921383154817045, guid: a95969c8937e56046bdf6b6d3e2d1c38, type: 3}
-      propertyPath: m_LocalRotation.z
-      value: -0
-      objectReference: {fileID: 0}
-    - target: {fileID: -8679921383154817045, guid: a95969c8937e56046bdf6b6d3e2d1c38, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: -8679921383154817045, guid: a95969c8937e56046bdf6b6d3e2d1c38, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: -8679921383154817045, guid: a95969c8937e56046bdf6b6d3e2d1c38, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: -7511558181221131132, guid: a95969c8937e56046bdf6b6d3e2d1c38, type: 3}
-      propertyPath: m_Materials.Array.data[0]
-      value: 
-      objectReference: {fileID: 2100000, guid: ea038b1990cdfa742abeaa654d826674, type: 2}
-    - target: {fileID: -5754084199372789682, guid: a95969c8937e56046bdf6b6d3e2d1c38, type: 3}
-      propertyPath: m_Mesh
-      value: 
-      objectReference: {fileID: -6740526933416455741, guid: f8c594ef52ebfc44e98bdc02acc2a16c, type: 3}
-    - target: {fileID: 919132149155446097, guid: a95969c8937e56046bdf6b6d3e2d1c38, type: 3}
-      propertyPath: m_Name
-      value: yun_qiu
-      objectReference: {fileID: 0}
-    - target: {fileID: 919132149155446097, guid: a95969c8937e56046bdf6b6d3e2d1c38, type: 3}
-      propertyPath: m_IsActive
-      value: 1
-      objectReference: {fileID: 0}
-    m_RemovedComponents: []
-    m_RemovedGameObjects: []
-    m_AddedGameObjects: []
-    m_AddedComponents: []
-  m_SourcePrefab: {fileID: 100100000, guid: a95969c8937e56046bdf6b6d3e2d1c38, type: 3}
---- !u!4 &5725328302096196011 stripped
-Transform:
-  m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: a95969c8937e56046bdf6b6d3e2d1c38, type: 3}
-  m_PrefabInstance: {fileID: 5259864327012369984}
-  m_PrefabAsset: {fileID: 0}
---- !u!1001 &6356176540061762019
-PrefabInstance:
-  m_ObjectHideFlags: 0
-  serializedVersion: 2
-  m_Modification:
-    serializedVersion: 3
-    m_TransformParent: {fileID: 4177647096219069143}
-    m_Modifications:
-    - target: {fileID: -8679921383154817045, guid: f61d564ea9bfa194f9adebd3e1caf520, type: 3}
-      propertyPath: m_LocalScale.x
-      value: 0.99754554
-      objectReference: {fileID: 0}
-    - target: {fileID: -8679921383154817045, guid: f61d564ea9bfa194f9adebd3e1caf520, type: 3}
-      propertyPath: m_LocalScale.y
-      value: 0.99754554
-      objectReference: {fileID: 0}
-    - target: {fileID: -8679921383154817045, guid: f61d564ea9bfa194f9adebd3e1caf520, type: 3}
-      propertyPath: m_LocalScale.z
-      value: 0.99754554
-      objectReference: {fileID: 0}
-    - target: {fileID: -8679921383154817045, guid: f61d564ea9bfa194f9adebd3e1caf520, type: 3}
-      propertyPath: m_LocalPosition.x
-      value: 0.105
-      objectReference: {fileID: 0}
-    - target: {fileID: -8679921383154817045, guid: f61d564ea9bfa194f9adebd3e1caf520, type: 3}
-      propertyPath: m_LocalPosition.y
-      value: -7.6
-      objectReference: {fileID: 0}
-    - target: {fileID: -8679921383154817045, guid: f61d564ea9bfa194f9adebd3e1caf520, type: 3}
-      propertyPath: m_LocalPosition.z
-      value: 97.3
-      objectReference: {fileID: 0}
-    - target: {fileID: -8679921383154817045, guid: f61d564ea9bfa194f9adebd3e1caf520, type: 3}
-      propertyPath: m_LocalRotation.w
-      value: 0.7071068
-      objectReference: {fileID: 0}
-    - target: {fileID: -8679921383154817045, guid: f61d564ea9bfa194f9adebd3e1caf520, type: 3}
-      propertyPath: m_LocalRotation.x
-      value: -0.7071068
-      objectReference: {fileID: 0}
-    - target: {fileID: -8679921383154817045, guid: f61d564ea9bfa194f9adebd3e1caf520, type: 3}
-      propertyPath: m_LocalRotation.y
-      value: -0
-      objectReference: {fileID: 0}
-    - target: {fileID: -8679921383154817045, guid: f61d564ea9bfa194f9adebd3e1caf520, type: 3}
-      propertyPath: m_LocalRotation.z
-      value: -0
-      objectReference: {fileID: 0}
-    - target: {fileID: -8679921383154817045, guid: f61d564ea9bfa194f9adebd3e1caf520, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.x
-      value: -90
-      objectReference: {fileID: 0}
-    - target: {fileID: -8679921383154817045, guid: f61d564ea9bfa194f9adebd3e1caf520, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: -8679921383154817045, guid: f61d564ea9bfa194f9adebd3e1caf520, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: -7511558181221131132, guid: f61d564ea9bfa194f9adebd3e1caf520, type: 3}
-      propertyPath: m_Materials.Array.data[0]
-      value: 
-      objectReference: {fileID: 2100000, guid: c9fb8078a489c764e9c5286bb9821001, type: 2}
-    - target: {fileID: 919132149155446097, guid: f61d564ea9bfa194f9adebd3e1caf520, type: 3}
-      propertyPath: m_Name
-      value: yuanjing_huan
-      objectReference: {fileID: 0}
-    - target: {fileID: 919132149155446097, guid: f61d564ea9bfa194f9adebd3e1caf520, type: 3}
-      propertyPath: m_IsActive
-      value: 1
-      objectReference: {fileID: 0}
-    m_RemovedComponents: []
-    m_RemovedGameObjects: []
-    m_AddedGameObjects: []
-    m_AddedComponents: []
-  m_SourcePrefab: {fileID: 100100000, guid: f61d564ea9bfa194f9adebd3e1caf520, type: 3}
---- !u!4 &6899256924629427720 stripped
-Transform:
-  m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: f61d564ea9bfa194f9adebd3e1caf520, type: 3}
-  m_PrefabInstance: {fileID: 6356176540061762019}
-  m_PrefabAsset: {fileID: 0}

+ 3 - 3
Assets/Art/ParallaxCloud/Material/ParallaxCloud.mat

@@ -54,12 +54,12 @@ Material:
         m_Offset: {x: 0, y: 0.76}
     m_Ints: []
     m_Floats:
-    - _Alpha: 0.82
+    - _Alpha: 0.9
     - _AlphaContrast: 0.5
     - _AlphaExtent: 5
-    - _MoveSpeed: 0.02
+    - _MoveSpeed: 0.05
     - _ParallaxLayers: 50
-    - _ParallaxSize: 0.065
+    - _ParallaxSize: 0.0971
     - _ParallaxType: 4
     - _SteepParallax: 1
     - _ViewOffset: 0

+ 7 - 3
Assets/Art/cs3.scene

@@ -78474,8 +78474,8 @@ Camera:
     width: 1
     height: 1
   near clip plane: 0.3
-  far clip plane: 1000
-  field of view: 63.2
+  far clip plane: 300
+  field of view: 60
   orthographic: 0
   orthographic size: 5
   m_Depth: -1
@@ -256714,6 +256714,10 @@ PrefabInstance:
     serializedVersion: 3
     m_TransformParent: {fileID: 0}
     m_Modifications:
+    - target: {fileID: 1398171176346647818, guid: 600addf310c15f74da80c081c179e5c2, type: 3}
+      propertyPath: m_LocalScale.z
+      value: 1000
+      objectReference: {fileID: 0}
     - target: {fileID: 4177647096219069143, guid: 600addf310c15f74da80c081c179e5c2, type: 3}
       propertyPath: m_LocalPosition.x
       value: 0
@@ -256764,7 +256768,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 8929588464290711568, guid: 600addf310c15f74da80c081c179e5c2, type: 3}
       propertyPath: m_IsActive
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     m_RemovedComponents: []
     m_RemovedGameObjects: []

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

@@ -30,7 +30,7 @@ Transform:
   m_GameObject: {fileID: 65994213146227239}
   serializedVersion: 2
   m_LocalRotation: {x: 0.17364816, y: 0, z: 0, w: 0.9848078}
-  m_LocalPosition: {x: -0, y: -2, z: -0.7}
+  m_LocalPosition: {x: -0, y: 0, z: -0.7}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
@@ -69,7 +69,7 @@ Camera:
     width: 1
     height: 1
   near clip plane: 0.3
-  far clip plane: 300
+  far clip plane: 400
   field of view: 60
   orthographic: 0
   orthographic size: 5
@@ -182,7 +182,7 @@ Transform:
   m_GameObject: {fileID: 4286731389157393447}
   serializedVersion: 2
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 24.1, y: 12.5, z: 25.6}
+  m_LocalPosition: {x: 24.1, y: 25, z: 25.6}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:

+ 10 - 182
Assets/Scenes/testCombat.scene

@@ -16,12 +16,12 @@ OcclusionCullingSettings:
 RenderSettings:
   m_ObjectHideFlags: 0
   serializedVersion: 9
-  m_Fog: 0
+  m_Fog: 1
   m_FogColor: {r: 0.3922214, g: 0.6187926, b: 0.735849, a: 1}
-  m_FogMode: 3
+  m_FogMode: 1
   m_FogDensity: 0
-  m_LinearFogStart: 0
-  m_LinearFogEnd: 300
+  m_LinearFogStart: 30
+  m_LinearFogEnd: 150
   m_AmbientSkyColor: {r: 0.5330794, g: 0.5688951, b: 0.6679245, a: 1}
   m_AmbientEquatorColor: {r: 0.114, g: 0.125, b: 0.133, a: 1}
   m_AmbientGroundColor: {r: 0.047, g: 0.043, b: 0.035, a: 1}
@@ -39,7 +39,7 @@ RenderSettings:
   m_ReflectionBounces: 1
   m_ReflectionIntensity: 1
   m_CustomReflection: {fileID: 0}
-  m_Sun: {fileID: 0}
+  m_Sun: {fileID: 376281606}
   m_UseRadianceAmbientProbe: 0
 --- !u!157 &3
 LightmapSettings:
@@ -288,126 +288,6 @@ Transform:
   - {fileID: 1612509952}
   m_Father: {fileID: 611864970}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!1 &111679905
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 7
-  m_Component:
-  - component: {fileID: 111679908}
-  - component: {fileID: 111679907}
-  - component: {fileID: 111679906}
-  m_Layer: 0
-  m_HasEditorInfo: 1
-  m_Name: Directional Light (1)
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!114 &111679906
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 111679905}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 474bcb49853aa07438625e644c072ee6, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_Version: 3
-  m_UsePipelineSettings: 1
-  m_AdditionalLightsShadowResolutionTier: 2
-  m_LightLayerMask: 1
-  m_RenderingLayers: 1
-  m_CustomShadowLayers: 0
-  m_ShadowLayerMask: 1
-  m_ShadowRenderingLayers: 1
-  m_LightCookieSize: {x: 1, y: 1}
-  m_LightCookieOffset: {x: 0, y: 0}
-  m_SoftShadowQuality: 0
---- !u!108 &111679907
-Light:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 111679905}
-  m_Enabled: 1
-  serializedVersion: 10
-  m_Type: 1
-  m_Shape: 0
-  m_Color: {r: 1, g: 1, b: 1, a: 1}
-  m_Intensity: 1
-  m_Range: 10
-  m_SpotAngle: 30
-  m_InnerSpotAngle: 21.80208
-  m_CookieSize: 10
-  m_Shadows:
-    m_Type: 0
-    m_Resolution: -1
-    m_CustomResolution: -1
-    m_Strength: 1
-    m_Bias: 0
-    m_NormalBias: 0
-    m_NearPlane: 0.1
-    m_CullingMatrixOverride:
-      e00: 1
-      e01: 0
-      e02: 0
-      e03: 0
-      e10: 0
-      e11: 1
-      e12: 0
-      e13: 0
-      e20: 0
-      e21: 0
-      e22: 1
-      e23: 0
-      e30: 0
-      e31: 0
-      e32: 0
-      e33: 1
-    m_UseCullingMatrixOverride: 0
-  m_Cookie: {fileID: 0}
-  m_DrawHalo: 0
-  m_Flare: {fileID: 0}
-  m_RenderMode: 0
-  m_CullingMask:
-    serializedVersion: 2
-    m_Bits: 4294967295
-  m_RenderingLayerMask: 1
-  m_Lightmapping: 4
-  m_LightShadowCasterMode: 0
-  m_AreaSize: {x: 1, y: 1}
-  m_BounceIntensity: 1
-  m_ColorTemperature: 6570
-  m_UseColorTemperature: 0
-  m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0}
-  m_UseBoundingSphereOverride: 0
-  m_UseViewFrustumForShadowCasterCull: 1
-  m_ShadowRadius: 0
-  m_ShadowAngle: 0
-  m_UseOcclusionCulling: 1
---- !u!4 &111679908
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 111679905}
-  serializedVersion: 2
-  m_LocalRotation: {x: 0.018050352, y: 0.023979872, z: 0.07840227, w: 0.99647}
-  m_LocalPosition: {x: 0, y: 3, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_ConstrainProportionsScale: 0
-  m_Children: []
-  m_Father: {fileID: 0}
-  m_LocalEulerAnglesHint: {x: 1.846, y: 2.903, z: 9.044}
 --- !u!213 &119886128
 Sprite:
   m_ObjectHideFlags: 0
@@ -1309,56 +1189,6 @@ Camera:
   m_OcclusionCulling: 1
   m_StereoConvergence: 10
   m_StereoSeparation: 0.022
---- !u!1 &235899919
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 7
-  m_Component:
-  - component: {fileID: 235899921}
-  - component: {fileID: 235899920}
-  m_Layer: 0
-  m_HasEditorInfo: 1
-  m_Name: Global Volume
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!114 &235899920
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 235899919}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 172515602e62fb746b5d573b38a5fe58, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_IsGlobal: 1
-  priority: 0
-  blendDistance: 0
-  weight: 1
-  sharedProfile: {fileID: 11400000, guid: 496338e1d0a9f5044a8a11b13fc0e848, type: 2}
---- !u!4 &235899921
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 235899919}
-  serializedVersion: 2
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0.75207627, y: 2.2221353, z: 0.10582106}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_ConstrainProportionsScale: 0
-  m_Children: []
-  m_Father: {fileID: 0}
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!224 &244605564 stripped
 RectTransform:
   m_CorrespondingSourceObject: {fileID: 8510026615150398487, guid: e5e908d8e878cd04098dc957e054e88c, type: 3}
@@ -1711,8 +1541,8 @@ Light:
   serializedVersion: 10
   m_Type: 1
   m_Shape: 0
-  m_Color: {r: 0.6886792, g: 0.6886792, b: 0.6886792, a: 1}
-  m_Intensity: 1.2
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_Intensity: 1.5
   m_Range: 10
   m_SpotAngle: 30
   m_InnerSpotAngle: 21.80208
@@ -1848,7 +1678,7 @@ RectTransform:
   m_Father: {fileID: 1080868192}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
   m_AnchoredPosition: {x: 5.334717, y: 0.34000206}
   m_SizeDelta: {x: 9.730537, y: -8.419997}
   m_Pivot: {x: 0.5, y: 0.5}
@@ -2449,7 +2279,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &753442136
 RectTransform:
   m_ObjectHideFlags: 0
@@ -7013,15 +6843,13 @@ SceneRoots:
   m_ObjectHideFlags: 0
   m_Roots:
   - {fileID: 376281607}
-  - {fileID: 111679908}
-  - {fileID: 235899921}
   - {fileID: 123020045}
+  - {fileID: 5102730602139337721}
   - {fileID: 293130736}
   - {fileID: 5358946683971136692}
   - {fileID: 501511835}
   - {fileID: 6588466611375917160}
   - {fileID: 461893080}
-  - {fileID: 5102730602139337721}
   - {fileID: 5496476638347437383}
   - {fileID: 2101400848}
   - {fileID: 1663534286}

+ 1 - 1
Assets/xiuxian/cs/Global Volume Profile.asset → Assets/xiuxian/cs/cj01.asset

@@ -10,7 +10,7 @@ MonoBehaviour:
   m_Enabled: 1
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: d7fd9488000d3734a9e00ee676215985, type: 3}
-  m_Name: Global Volume Profile
+  m_Name: cj01
   m_EditorClassIdentifier: 
   components:
   - {fileID: 8585920327294717956}

+ 0 - 0
Assets/xiuxian/cs/Global Volume Profile.asset.meta → Assets/xiuxian/cs/cj01.asset.meta


+ 8 - 8
UserSettings/EditorUserSettings.asset

@@ -21,28 +21,28 @@ EditorUserSettings:
       value: 184c
       flags: 0
     RecentlyUsedSceneGuid-0:
-      value: 5402055e01025b5a095e587749765c44464e4b78292a20322c7f4b67b3b4653e
+      value: 5400010356575a0d5d0d587a14710644104f4c2f7c2c2469787c4461e3b2326f
       flags: 0
     RecentlyUsedSceneGuid-1:
-      value: 5409015152055b030e085b7212215944454f4d727c7b73677f7b4437e4e3646f
+      value: 5402055e01025b5a095e587749765c44464e4b78292a20322c7f4b67b3b4653e
       flags: 0
     RecentlyUsedSceneGuid-2:
-      value: 555206545c000f095f0a08711577071214164e7c7f7d2033747c4832e7b3626b
+      value: 5409015152055b030e085b7212215944454f4d727c7b73677f7b4437e4e3646f
       flags: 0
     RecentlyUsedSceneGuid-3:
-      value: 5a500c0357030b0f0858097a44770f40154f4f2e2a2c743229794b64e0b56c6a
+      value: 555206545c000f095f0a08711577071214164e7c7f7d2033747c4832e7b3626b
       flags: 0
     RecentlyUsedSceneGuid-4:
-      value: 515702525d040a085b0d0e70167706484515492c2e7f27322c7c1f6abae26539
+      value: 5a500c0357030b0f0858097a44770f40154f4f2e2a2c743229794b64e0b56c6a
       flags: 0
     RecentlyUsedSceneGuid-5:
-      value: 5454505755025b5d5d5f0a74487709404516192f287971662e2b4564e3e4373e
+      value: 515702525d040a085b0d0e70167706484515492c2e7f27322c7c1f6abae26539
       flags: 0
     RecentlyUsedSceneGuid-6:
-      value: 50030c5e500c58580e5d5c71457a0e44124f4d78292e7434787b1e36b2b4323a
+      value: 5454505755025b5d5d5f0a74487709404516192f287971662e2b4564e3e4373e
       flags: 0
     RecentlyUsedSceneGuid-7:
-      value: 52035153040d5d0f5f5f0f21117a0744154f4e79282d70357a2b4f61e6e4656a
+      value: 50030c5e500c58580e5d5c71457a0e44124f4d78292e7434787b1e36b2b4323a
       flags: 0
     RecentlyUsedSceneGuid-8:
       value: 52570c02000d5e025a58597212725c4440161c2e797a75607f2c4467b7b3323e