Explorar el Código

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

lzx hace 1 día
padre
commit
c0723534f2
Se han modificado 43 ficheros con 1994 adiciones y 8941 borrados
  1. 415 0
      Assets/Art/Environment/cj01.prefab
  2. 1 1
      Assets/Art/Environment/cj01.prefab.meta
  3. 7 4
      Assets/Art/VFX/FXPrefabs/fx_gf_bingqiu.prefab
  4. 23 14
      Assets/Art/VFX/FXPrefabs/fx_gf_bingqiu_hit.prefab
  5. 15 12
      Assets/Art/VFX/FXPrefabs/fx_gf_bingzhui.prefab
  6. 26 17
      Assets/Art/VFX/FXPrefabs/fx_gf_bingzhui_hit.prefab
  7. 6 3
      Assets/Art/VFX/FXPrefabs/fx_gf_duzhen.prefab
  8. 14 11
      Assets/Art/VFX/FXPrefabs/fx_gf_jianjue.prefab
  9. 58 57
      Assets/Art/VFX/FXPrefabs/fx_gf_jianjue_hit.prefab
  10. 16 13
      Assets/Art/VFX/FXPrefabs/fx_gf_lieyanjian.prefab
  11. 77 68
      Assets/Art/VFX/FXPrefabs/fx_gf_lieyanjian_hit.prefab
  12. 9 9
      Assets/Art/VFX/FXPrefabs/fx_gf_mozhan_hit.prefab
  13. 6 2
      Assets/Art/VFX/Materials/010_lz.mat
  14. 138 0
      Assets/Art/VFX/Materials/fx_add_glow.mat
  15. 8 0
      Assets/Art/VFX/Materials/fx_add_glow.mat.meta
  16. 112 0
      Assets/Art/VFX/Materials/fx_bd_shizi_bai.mat
  17. 8 0
      Assets/Art/VFX/Materials/fx_bd_shizi_bai.mat.meta
  18. 3 3
      Assets/Art/VFX/Materials/fx_frenel_lieyanjian.mat
  19. 1 1
      Assets/Art/VFX/Materials/fx_lz1_al.mat
  20. 1 1
      Assets/Art/VFX/Materials/fx_xl_huo5.mat
  21. 2 2
      Assets/Art/VFX/Mesh/bingzhui1/mesh_bingzhui1.mat
  22. BIN
      Assets/Art/VFX/Textures/fx_bd1_bai.png
  23. 133 0
      Assets/Art/VFX/Textures/fx_bd1_bai.png.meta
  24. 194 701
      Assets/Art/cs3.scene
  25. 277 0
      Assets/Res/CombatScenes/LevelBattle01.prefab
  26. 1 1
      Assets/Res/CombatScenes/LevelBattle01.prefab.meta
  27. 0 66
      Assets/Res/CombatScenes/NavMeshTarget.prefab
  28. 0 1289
      Assets/Res/LevelSecne/LevelBattle1.prefab
  29. 1 5
      Assets/Scenes/testCombat.scene
  30. 105 18
      Assets/Scripts/GameLogic/Combat/CombatTool/CombatSenceController.cs
  31. 3 0
      Assets/Scripts/GameLogic/Combat/CombatTool/SceneTool.meta
  32. 40 0
      Assets/Scripts/GameLogic/Combat/CombatTool/SceneTool/SceneConfig.cs
  33. 3 0
      Assets/Scripts/GameLogic/Combat/CombatTool/SceneTool/SceneConfig.cs.meta
  34. 29 0
      Assets/Scripts/GameLogic/Combat/CombatTool/SceneTool/SceneMonoConfig.cs
  35. 3 0
      Assets/Scripts/GameLogic/Combat/CombatTool/SceneTool/SceneMonoConfig.cs.meta
  36. 21 0
      Assets/Scripts/GameLogic/Combat/CombatTool/SceneTool/SceneObjectConfig.cs
  37. 3 0
      Assets/Scripts/GameLogic/Combat/CombatTool/SceneTool/SceneObjectConfig.cs.meta
  38. 2 2
      Assets/Scripts/GameLogic/Combat/CombatType/TestCombatType.cs
  39. 0 10
      Assets/Scripts/GameLogic/CombatScenesTool/CombatScenesConfig.cs
  40. 0 3
      Assets/Scripts/GameLogic/CombatScenesTool/CombatScenesConfig.cs.meta
  41. 0 0
      Assets/StreamingAssets/assetConfig.txt
  42. 8 8
      UserSettings/EditorUserSettings.asset
  43. 225 6620
      UserSettings/Layouts/default-2022.dwlt

+ 415 - 0
Assets/Art/Environment/cj01.prefab

@@ -0,0 +1,415 @@
+%YAML 1.1
+%TAG !u! tag:yousandi.cn,2023:
+--- !u!1 &343516389969251701
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 1398171176346647818}
+  - component: {fileID: 5360880237618302960}
+  - component: {fileID: 8035256398326852424}
+  - component: {fileID: 4762318038508566971}
+  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 &1398171176346647818
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  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_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 4177647096219069143}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!33 &5360880237618302960
+MeshFilter:
+  m_ObjectHideFlags: 2
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 343516389969251701}
+  m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
+--- !u!23 &8035256398326852424
+MeshRenderer:
+  m_ObjectHideFlags: 2
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 343516389969251701}
+  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 &4762318038508566971
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 343516389969251701}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 334f5cfa565f62949a853f351ccdb316, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  fogType: 6
+  fogMin: 0
+  fogMax: 15
+  _fogDepth: 15
+  secFogMin: 0
+  secFogMax: 1
+  worldSize: {x: 500, y: 30, z: 1000}
+  fogFalloffType: 0
+  fogFalloffCurve: 1
+  sortingLayer: Default
+  sortingOrder: 0
+  renderingLayerMask: 4294967295
+  fogColor: {r: 0.4862745, g: 0.69496423, b: 0.7372549, a: 1}
+  blendType: 0
+  fogMeshType: 0
+  customMesh: {fileID: 0}
+  fogClipping: 0
+  renderMode: 1
+  affectedByLights: 0
+  lightScatteringFactor: 0.35
+  lightReflectivity: 0.5
+  lightTransmission: 0.5
+--- !u!1 &5101112991752729148
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 5646907003157828046}
+  - component: {fileID: 2477234385467551022}
+  - component: {fileID: 6021425485418143758}
+  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 &5646907003157828046
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  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_ConstrainProportionsScale: 1
+  m_Children: []
+  m_Father: {fileID: 4177647096219069143}
+  m_LocalEulerAnglesHint: {x: 90, y: 0, z: 0}
+--- !u!33 &2477234385467551022
+MeshFilter:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5101112991752729148}
+  m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0}
+--- !u!23 &6021425485418143758
+MeshRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5101112991752729148}
+  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: 440486496c8724f4aacb57ab6f2cdd03, 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
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 4177647096219069143}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: cj01
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &4177647096219069143
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  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_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children:
+  - {fileID: 5646907003157828046}
+  - {fileID: 5725328302096196011}
+  - {fileID: 1398171176346647818}
+  - {fileID: 6899256924629427720}
+  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}

+ 1 - 1
Assets/Res/CombatScenes/NavMeshTarget.prefab.meta → Assets/Art/Environment/cj01.prefab.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: XigevC3+Uy1mNc3J2WNkZ41Cci+rL8ZxpUZgUDz+b3I5SutashzIYQ3Z6wzI
+guid: CXof5H75BXjR1ITahcTWt3np76Qb9pNGvAyiGw3+6Zh9pLY6r9hm6vw9dExU
 PrefabImporter:
   externalObjects: {}
   userData: 

+ 7 - 4
Assets/Art/VFX/FXPrefabs/fx_gf_bingqiu.prefab

@@ -14905,16 +14905,16 @@ TrailRenderer:
       m_RotationOrder: 4
     colorGradient:
       serializedVersion: 2
-      key0: {r: 0.13664407, g: 0.23121129, b: 0.29559743, a: 1}
-      key1: {r: 0.052806433, g: 0.13989866, b: 0.18867922, a: 1}
+      key0: {r: 0.31121153, g: 0.46392152, b: 0.573, a: 1}
+      key1: {r: 0.31121153, g: 0.46392152, b: 0.573, a: 0}
       key2: {r: 0.10288352, g: 0.15282823, b: 0.21383637, a: 0}
       key3: {r: 0.10288352, g: 0.15282823, b: 0.21383637, a: 0}
       key4: {r: 0, g: 0, b: 0, a: 0}
       key5: {r: 0, g: 0, b: 0, a: 0}
       key6: {r: 0, g: 0, b: 0, a: 0}
       key7: {r: 0, g: 0, b: 0, a: 0}
-      ctime0: 6682
-      ctime1: 24287
+      ctime0: 0
+      ctime1: 65535
       ctime2: 24287
       ctime3: 40349
       ctime4: 0
@@ -19879,9 +19879,11 @@ MonoBehaviour:
   multipleTargetDelayTime: 0
   hitFxName: fx_gf_bingqiu_hit
   hitAudioName: 
+  extraMoveSpeed: 0
   isPenetrate: 0
   isUseCustomTargetEndPos: 0
   customTargetEndPosIndex: 0
+  size: 1
   speed: 20
   parabolaCurveType: 0
   isTriggerGroundEnd: 0
@@ -19890,6 +19892,7 @@ MonoBehaviour:
   BesselPath:
     isActive: 0
     controlPoints: []
+    allDis: 0
   maxDis: 20
 --- !u!54 &1757780971700255179
 Rigidbody:

+ 23 - 14
Assets/Art/VFX/FXPrefabs/fx_gf_bingqiu_hit.prefab

@@ -224,7 +224,7 @@ ParticleSystem:
       serializedVersion: 2
       minMaxState: 0
       minColor: {r: 0.2924528, g: 0.028236823, b: 0, a: 1}
-      maxColor: {r: 0.0683516, g: 0.44654465, b: 0.8050314, a: 0.89411765}
+      maxColor: {r: 0.6901961, g: 0.827451, b: 0.9529412, a: 0.89411765}
       maxGradient:
         serializedVersion: 2
         key0: {r: 1, g: 1, b: 1, a: 1}
@@ -11156,8 +11156,8 @@ ParticleSystem:
       maxColor: {r: 1, g: 1, b: 1, a: 1}
       maxGradient:
         serializedVersion: 2
-        key0: {r: 0.16820922, g: 0.6886311, b: 0.8490566, a: 1}
-        key1: {r: 0.11801348, g: 0.23099093, b: 0.3207547, a: 1}
+        key0: {r: 0.53076106, g: 0.82350296, b: 0.9137466, a: 1}
+        key1: {r: 0.1885448, g: 0.43965644, b: 0.638814, a: 1}
         key2: {r: 0.0045686336, g: 0.03291244, b: 0.13207549, a: 0}
         key3: {r: 0, g: 0, b: 0, a: 0}
         key4: {r: 0, g: 0, b: 0, a: 0}
@@ -11165,7 +11165,7 @@ ParticleSystem:
         key6: {r: 0, g: 0, b: 0, a: 0}
         key7: {r: 0, g: 0, b: 0, a: 0}
         ctime0: 8867
-        ctime1: 47545
+        ctime1: 50280
         ctime2: 47545
         ctime3: 0
         ctime4: 0
@@ -14905,7 +14905,7 @@ ParticleSystem:
       serializedVersion: 2
       minMaxState: 0
       minColor: {r: 1, g: 1, b: 1, a: 1}
-      maxColor: {r: 0.5083263, g: 0.7525903, b: 0.8930817, a: 1}
+      maxColor: {r: 0.50980395, g: 0.7529412, b: 0.89411765, a: 1}
       maxGradient:
         serializedVersion: 2
         key0: {r: 1, g: 1, b: 1, a: 1}
@@ -14969,7 +14969,7 @@ ParticleSystem:
     startSize:
       serializedVersion: 2
       minMaxState: 0
-      scalar: 0.21
+      scalar: 0.34
       minScalar: 1
       maxCurve:
         serializedVersion: 2
@@ -15728,18 +15728,27 @@ ParticleSystem:
         - serializedVersion: 3
           time: 0
           value: 0
-          inSlope: 2
-          outSlope: 2
-          tangentMode: 0
+          inSlope: -2
+          outSlope: 3.0417721
+          tangentMode: 69
           weightedMode: 0
           inWeight: 0
           outWeight: 0
+        - serializedVersion: 3
+          time: 0.2696314
+          value: 0.82015723
+          inSlope: 3.0417721
+          outSlope: 0.24623562
+          tangentMode: 69
+          weightedMode: 0
+          inWeight: 0.33333334
+          outWeight: 0.33333334
         - serializedVersion: 3
           time: 1
           value: 1
-          inSlope: 0
+          inSlope: 0.24623562
           outSlope: 0
-          tangentMode: 0
+          tangentMode: 69
           weightedMode: 0
           inWeight: 0
           outWeight: 0
@@ -19797,7 +19806,7 @@ ParticleSystem:
       serializedVersion: 2
       minMaxState: 0
       minColor: {r: 1, g: 1, b: 1, a: 1}
-      maxColor: {r: 0.28616333, g: 0.6618668, b: 1, a: 0.44705883}
+      maxColor: {r: 0.5372549, g: 0.78039217, b: 1, a: 0.5294118}
       maxGradient:
         serializedVersion: 2
         key0: {r: 1, g: 1, b: 1, a: 1}
@@ -24522,7 +24531,7 @@ ParticleSystem:
   startDelay:
     serializedVersion: 2
     minMaxState: 0
-    scalar: 0
+    scalar: 0.1
     minScalar: 0
     maxCurve:
       serializedVersion: 2
@@ -27181,7 +27190,7 @@ ParticleSystem:
     inWorldSpace: 0
     multiplyDragByParticleSize: 1
     multiplyDragByParticleVelocity: 1
-    dampen: 0.4
+    dampen: 0.3
     drag:
       serializedVersion: 2
       minMaxState: 0

+ 15 - 12
Assets/Art/VFX/FXPrefabs/fx_gf_bingzhui.prefab

@@ -4934,9 +4934,11 @@ MonoBehaviour:
   multipleTargetDelayTime: 0.1
   hitFxName: fx_gf_bingzhui_hit
   hitAudioName: 
+  extraMoveSpeed: 0
   isPenetrate: 0
   isUseCustomTargetEndPos: 0
   customTargetEndPosIndex: 0
+  size: 1
   speed: 20
   parabolaCurveType: 1
   isTriggerGroundEnd: 0
@@ -4945,6 +4947,7 @@ MonoBehaviour:
   BesselPath:
     isActive: 0
     controlPoints: []
+    allDis: 0
   maxDis: 20
 --- !u!54 &5712450709070025940
 Rigidbody:
@@ -5197,7 +5200,7 @@ ParticleSystem:
       serializedVersion: 2
       minMaxState: 0
       minColor: {r: 1, g: 0.14779866, b: 0.31108844, a: 1}
-      maxColor: {r: 0.122641385, g: 0.59037644, b: 1, a: 1}
+      maxColor: {r: 0.661725, g: 0.84294367, b: 0.99999994, a: 1}
       maxGradient:
         serializedVersion: 2
         key0: {r: 1, g: 1, b: 1, a: 1}
@@ -5315,7 +5318,7 @@ ParticleSystem:
       serializedVersion: 2
       minMaxState: 3
       scalar: 0.1
-      minScalar: 0.3
+      minScalar: 0.2
       maxCurve:
         serializedVersion: 2
         m_Curve:
@@ -6020,12 +6023,12 @@ ParticleSystem:
         - serializedVersion: 3
           time: 0
           value: 1
-          inSlope: 0
-          outSlope: 0
+          inSlope: -1.4636807
+          outSlope: -1.4636807
           tangentMode: 0
           weightedMode: 0
           inWeight: 0
-          outWeight: 0
+          outWeight: 0.15039496
         - serializedVersion: 3
           time: 1
           value: 0
@@ -10098,7 +10101,7 @@ ParticleSystem:
       serializedVersion: 2
       minMaxState: 0
       minColor: {r: 1, g: 1, b: 1, a: 1}
-      maxColor: {r: 0.262544, g: 0.5761889, b: 0.976, a: 0.75686276}
+      maxColor: {r: 0.7199707, g: 0.8359517, b: 0.9838275, a: 0.5176471}
       maxGradient:
         serializedVersion: 2
         key0: {r: 1, g: 1, b: 1, a: 1}
@@ -15168,7 +15171,7 @@ ParticleSystem:
       serializedVersion: 2
       minMaxState: 0
       minColor: {r: 1, g: 1, b: 1, a: 1}
-      maxColor: {r: 0.28616333, g: 0.6618668, b: 1, a: 0.44705883}
+      maxColor: {r: 0.5377358, g: 0.78156745, b: 1, a: 0.5294118}
       maxGradient:
         serializedVersion: 2
         key0: {r: 1, g: 1, b: 1, a: 1}
@@ -19878,8 +19881,8 @@ TrailRenderer:
       m_RotationOrder: 4
     colorGradient:
       serializedVersion: 2
-      key0: {r: 0.07683628, g: 0.47893387, b: 0.6981132, a: 1}
-      key1: {r: 0.14119293, g: 0.51072824, b: 0.7610062, a: 1}
+      key0: {r: 0.43215677, g: 0.555128, b: 0.6226415, a: 1}
+      key1: {r: 0.07745146, g: 0.2979665, b: 0.55795145, a: 1}
       key2: {r: 0.10288352, g: 0.15282823, b: 0.21383637, a: 0}
       key3: {r: 0.10288352, g: 0.15282823, b: 0.21383637, a: 0}
       key4: {r: 0, g: 0, b: 0, a: 0}
@@ -19887,8 +19890,8 @@ TrailRenderer:
       key6: {r: 0, g: 0, b: 0, a: 0}
       key7: {r: 0, g: 0, b: 0, a: 0}
       ctime0: 0
-      ctime1: 6682
-      ctime2: 24287
+      ctime1: 31556
+      ctime2: 65535
       ctime3: 40349
       ctime4: 0
       ctime5: 0
@@ -19904,7 +19907,7 @@ TrailRenderer:
       atime7: 0
       m_Mode: 0
       m_ColorSpace: 0
-      m_NumColorKeys: 3
+      m_NumColorKeys: 2
       m_NumAlphaKeys: 2
     numCornerVertices: 0
     numCapVertices: 0

+ 26 - 17
Assets/Art/VFX/FXPrefabs/fx_gf_bingzhui_hit.prefab

@@ -57,7 +57,7 @@ ParticleSystem:
   startDelay:
     serializedVersion: 2
     minMaxState: 0
-    scalar: 0
+    scalar: 0.1
     minScalar: 0
     maxCurve:
       serializedVersion: 2
@@ -224,7 +224,7 @@ ParticleSystem:
       serializedVersion: 2
       minMaxState: 0
       minColor: {r: 1, g: 1, b: 1, a: 1}
-      maxColor: {r: 0.28616333, g: 0.6618668, b: 1, a: 0.44705883}
+      maxColor: {r: 0.5372549, g: 0.78039217, b: 1, a: 0.5294118}
       maxGradient:
         serializedVersion: 2
         key0: {r: 1, g: 1, b: 1, a: 1}
@@ -2689,7 +2689,7 @@ ParticleSystem:
     inWorldSpace: 0
     multiplyDragByParticleSize: 1
     multiplyDragByParticleVelocity: 1
-    dampen: 0.3
+    dampen: 0.2
     drag:
       serializedVersion: 2
       minMaxState: 0
@@ -4949,7 +4949,7 @@ ParticleSystem:
   startDelay:
     serializedVersion: 2
     minMaxState: 0
-    scalar: 0
+    scalar: 0.1
     minScalar: 0
     maxCurve:
       serializedVersion: 2
@@ -5180,7 +5180,7 @@ ParticleSystem:
     startSize:
       serializedVersion: 2
       minMaxState: 0
-      scalar: 0.21
+      scalar: 0.34
       minScalar: 1
       maxCurve:
         serializedVersion: 2
@@ -5939,18 +5939,27 @@ ParticleSystem:
         - serializedVersion: 3
           time: 0
           value: 0
-          inSlope: 2
-          outSlope: 2
-          tangentMode: 0
+          inSlope: -2
+          outSlope: 3.0417721
+          tangentMode: 69
           weightedMode: 0
           inWeight: 0
           outWeight: 0
+        - serializedVersion: 3
+          time: 0.2696314
+          value: 0.82015723
+          inSlope: 3.0417721
+          outSlope: 0.24623562
+          tangentMode: 69
+          weightedMode: 0
+          inWeight: 0.33333334
+          outWeight: 0.33333334
         - serializedVersion: 3
           time: 1
           value: 1
-          inSlope: 0
+          inSlope: 0.24623562
           outSlope: 0
-          tangentMode: 0
+          tangentMode: 69
           weightedMode: 0
           inWeight: 0
           outWeight: 0
@@ -14738,7 +14747,7 @@ ParticleSystem:
   startDelay:
     serializedVersion: 2
     minMaxState: 0
-    scalar: 0
+    scalar: 0.1
     minScalar: 0
     maxCurve:
       serializedVersion: 2
@@ -15293,7 +15302,7 @@ ParticleSystem:
     gravityModifier:
       serializedVersion: 2
       minMaxState: 0
-      scalar: 0.2
+      scalar: 0.1
       minScalar: 0
       maxCurve:
         serializedVersion: 2
@@ -17397,7 +17406,7 @@ ParticleSystem:
     inWorldSpace: 0
     multiplyDragByParticleSize: 1
     multiplyDragByParticleVelocity: 1
-    dampen: 0.4
+    dampen: 0.3
     drag:
       serializedVersion: 2
       minMaxState: 0
@@ -19824,7 +19833,7 @@ ParticleSystem:
       serializedVersion: 2
       minMaxState: 0
       minColor: {r: 0.2924528, g: 0.028236823, b: 0, a: 1}
-      maxColor: {r: 0.0683516, g: 0.44654465, b: 0.8050314, a: 0.89411765}
+      maxColor: {r: 0.69117117, g: 0.82738054, b: 0.9514825, a: 0.89411765}
       maxGradient:
         serializedVersion: 2
         key0: {r: 1, g: 1, b: 1, a: 1}
@@ -25859,8 +25868,8 @@ ParticleSystem:
       maxColor: {r: 1, g: 1, b: 1, a: 1}
       maxGradient:
         serializedVersion: 2
-        key0: {r: 0.16820922, g: 0.6886311, b: 0.8490566, a: 1}
-        key1: {r: 0.11801348, g: 0.23099093, b: 0.3207547, a: 1}
+        key0: {r: 0.53076106, g: 0.82350296, b: 0.9137466, a: 1}
+        key1: {r: 0.1885448, g: 0.43965644, b: 0.638814, a: 1}
         key2: {r: 0.0045686336, g: 0.03291244, b: 0.13207549, a: 0}
         key3: {r: 0, g: 0, b: 0, a: 0}
         key4: {r: 0, g: 0, b: 0, a: 0}
@@ -25868,7 +25877,7 @@ ParticleSystem:
         key6: {r: 0, g: 0, b: 0, a: 0}
         key7: {r: 0, g: 0, b: 0, a: 0}
         ctime0: 8867
-        ctime1: 47545
+        ctime1: 50280
         ctime2: 47545
         ctime3: 0
         ctime4: 0

+ 6 - 3
Assets/Art/VFX/FXPrefabs/fx_gf_duzhen.prefab

@@ -5021,9 +5021,11 @@ MonoBehaviour:
   multipleTargetDelayTime: 0.04
   hitFxName: fx_gf_duzhen_hit
   hitAudioName: 
+  extraMoveSpeed: 0
   isPenetrate: 0
   isUseCustomTargetEndPos: 0
   customTargetEndPosIndex: 0
+  size: 1
   speed: 20
   parabolaCurveType: 0
   isTriggerGroundEnd: 0
@@ -5032,6 +5034,7 @@ MonoBehaviour:
   BesselPath:
     isActive: 0
     controlPoints: []
+    allDis: 0
   maxDis: 20
 --- !u!54 &5923483964563381317
 Rigidbody:
@@ -14978,15 +14981,15 @@ TrailRenderer:
     colorGradient:
       serializedVersion: 2
       key0: {r: 0.021320285, g: 0.61635214, b: 0.092572525, a: 1}
-      key1: {r: 0, g: 0.20125782, b: 0.09955552, a: 1}
+      key1: {r: 0.021320285, g: 0.61635214, b: 0.092572525, a: 1}
       key2: {r: 0.10288352, g: 0.15282823, b: 0.21383637, a: 0}
       key3: {r: 0.10288352, g: 0.15282823, b: 0.21383637, a: 0}
       key4: {r: 0, g: 0, b: 0, a: 0}
       key5: {r: 0, g: 0, b: 0, a: 0}
       key6: {r: 0, g: 0, b: 0, a: 0}
       key7: {r: 0, g: 0, b: 0, a: 0}
-      ctime0: 6682
-      ctime1: 24287
+      ctime0: 0
+      ctime1: 65535
       ctime2: 24287
       ctime3: 40349
       ctime4: 0

+ 14 - 11
Assets/Art/VFX/FXPrefabs/fx_gf_jianjue.prefab

@@ -224,7 +224,7 @@ ParticleSystem:
       serializedVersion: 2
       minMaxState: 0
       minColor: {r: 0.9245283, g: 0.06454251, b: 0.22702827, a: 1}
-      maxColor: {r: 0.021547625, g: 0.20039296, b: 0.36200002, a: 1}
+      maxColor: {r: 0.20551649, g: 0.61703724, b: 0.9838275, a: 1}
       maxGradient:
         serializedVersion: 2
         key0: {r: 1, g: 1, b: 1, a: 1}
@@ -5143,7 +5143,7 @@ ParticleSystem:
       serializedVersion: 2
       minMaxState: 0
       minColor: {r: 1, g: 1, b: 1, a: 1}
-      maxColor: {r: 0.10830251, g: 0.46821347, b: 0.9308176, a: 1}
+      maxColor: {r: 0, g: 0.41428182, b: 0.9514825, a: 0.56078434}
       maxGradient:
         serializedVersion: 2
         key0: {r: 1, g: 1, b: 1, a: 1}
@@ -9911,17 +9911,17 @@ TrailRenderer:
       m_RotationOrder: 4
     colorGradient:
       serializedVersion: 2
-      key0: {r: 0.058479987, g: 0.5058767, b: 0.731, a: 1}
-      key1: {r: 0.019607844, g: 0.25393236, b: 0.627451, a: 1}
-      key2: {r: 0, g: 0.041740574, b: 0.2830189, a: 0}
+      key0: {r: 0.3113206, g: 0.7704404, b: 1, a: 1}
+      key1: {r: 0.0128225675, g: 0.21370961, b: 0.53, a: 1}
+      key2: {r: 0, g: 0.07794731, b: 0.3962264, a: 0}
       key3: {r: 0, g: 0, b: 0, a: 0}
       key4: {r: 0, g: 0, b: 0, a: 0}
       key5: {r: 0, g: 0, b: 0, a: 0}
       key6: {r: 0, g: 0, b: 0, a: 0}
       key7: {r: 0, g: 0, b: 0, a: 0}
       ctime0: 0
-      ctime1: 5654
-      ctime2: 40349
+      ctime1: 19330
+      ctime2: 65370
       ctime3: 0
       ctime4: 0
       ctime5: 0
@@ -9964,7 +9964,7 @@ GameObject:
   - component: {fileID: 7979595781667103859}
   m_Layer: 0
   m_HasEditorInfo: 1
-  m_Name: fx_bd_shizi
+  m_Name: fx_bd_shizi_bai
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -10175,7 +10175,7 @@ ParticleSystem:
       serializedVersion: 2
       minMaxState: 0
       minColor: {r: 0.2924528, g: 0.028236823, b: 0, a: 1}
-      maxColor: {r: 0.04807952, g: 0.44037977, b: 0.899371, a: 1}
+      maxColor: {r: 0.16037719, g: 0.5498406, b: 0.99999994, a: 1}
       maxGradient:
         serializedVersion: 2
         key0: {r: 1, g: 1, b: 1, a: 1}
@@ -14790,7 +14790,7 @@ ParticleSystemRenderer:
   m_RenderingLayerMask: 1
   m_RendererPriority: 0
   m_Materials:
-  - {fileID: 2100000, guid: e5708de714f455d4b8298388201415a0, type: 2}
+  - {fileID: 2100000, guid: 5a7dae49b1059a948a89db022f673cb0, type: 2}
   m_StaticBatchInfo:
     firstSubMesh: 0
     subMeshCount: 0
@@ -24673,9 +24673,11 @@ MonoBehaviour:
   multipleTargetDelayTime: 0.2
   hitFxName: fx_gf_jianjue_hit
   hitAudioName: 
+  extraMoveSpeed: 0
   isPenetrate: 0
   isUseCustomTargetEndPos: 0
   customTargetEndPosIndex: 0
+  size: 1
   speed: 10
   parabolaCurveType: 2
   isTriggerGroundEnd: 0
@@ -24688,6 +24690,7 @@ MonoBehaviour:
     - {x: -3.4864006, y: 2.3623633, z: -1.9866285}
     - {x: 0, y: 0, z: 2}
     - {x: 0, y: 0, z: 5}
+    allDis: 0
   maxDis: 20
 --- !u!54 &4514504105890551471
 Rigidbody:
@@ -24940,7 +24943,7 @@ ParticleSystem:
       serializedVersion: 2
       minMaxState: 0
       minColor: {r: 1, g: 1, b: 1, a: 1}
-      maxColor: {r: 0.18066922, g: 0.33337784, b: 0.5471698, a: 1}
+      maxColor: {r: 0.32078025, g: 0.5187086, b: 0.761, a: 1}
       maxGradient:
         serializedVersion: 2
         key0: {r: 1, g: 1, b: 1, a: 1}

+ 58 - 57
Assets/Art/VFX/FXPrefabs/fx_gf_jianjue_hit.prefab

@@ -5063,7 +5063,7 @@ ParticleSystem:
       serializedVersion: 2
       minMaxState: 3
       scalar: 20
-      minScalar: 1
+      minScalar: 5
       maxCurve:
         serializedVersion: 2
         m_Curve:
@@ -5116,7 +5116,7 @@ ParticleSystem:
       serializedVersion: 2
       minMaxState: 0
       minColor: {r: 0.9245283, g: 0.06454251, b: 0.22702827, a: 1}
-      maxColor: {r: 0.021547625, g: 0.20039296, b: 0.36200002, a: 1}
+      maxColor: {r: 0.12407274, g: 0.5501524, b: 0.9299191, a: 1}
       maxGradient:
         serializedVersion: 2
         key0: {r: 1, g: 1, b: 1, a: 1}
@@ -5180,8 +5180,8 @@ ParticleSystem:
     startSize:
       serializedVersion: 2
       minMaxState: 3
-      scalar: 0.4
-      minScalar: 0.1
+      scalar: 0.5
+      minScalar: 0.2
       maxCurve:
         serializedVersion: 2
         m_Curve:
@@ -9841,7 +9841,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 4341666617732393336}
   serializedVersion: 2
-  m_LocalRotation: {x: -0.000000074505806, y: -0, z: -0, w: 1}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: -1.101, y: -0.36, z: -1.08}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
@@ -14745,14 +14745,24 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: ced634dc38e34b2196415a552336d24c, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+  delayTime: 0
+  multipleTargetDelayTime: 0
   hitFxName: fx_gf_huoqiu_hit
   hitAudioName: 
+  extraMoveSpeed: 0
   isPenetrate: 0
   isUseCustomTargetEndPos: 0
   customTargetEndPosIndex: 0
+  size: 1
   speed: 10
+  parabolaCurveType: 0
   isTriggerGroundEnd: 0
   GroundHitFxName: 
+  isUseX: 0
+  BesselPath:
+    isActive: 0
+    controlPoints: []
+    allDis: 0
   maxDis: 20
 --- !u!54 &1141983929440001792
 Rigidbody:
@@ -15069,7 +15079,7 @@ ParticleSystem:
     startSize:
       serializedVersion: 2
       minMaxState: 0
-      scalar: 0.63
+      scalar: 0.87
       minScalar: 1
       maxCurve:
         serializedVersion: 2
@@ -16148,18 +16158,18 @@ ParticleSystem:
       maxColor: {r: 1, g: 1, b: 1, a: 1}
       maxGradient:
         serializedVersion: 2
-        key0: {r: 0.103773475, g: 0.63562804, b: 1, a: 1}
-        key1: {r: 0, g: 0.07699607, b: 0.23899364, a: 1}
-        key2: {r: 0.0045686336, g: 0.03291244, b: 0.13207549, a: 0}
-        key3: {r: 0, g: 0, b: 0, a: 0}
+        key0: {r: 0.43530995, g: 0.7805692, b: 1, a: 1}
+        key1: {r: 0.103773475, g: 0.63562804, b: 1, a: 1}
+        key2: {r: 0, g: 0.07699607, b: 0.23899364, a: 0}
+        key3: {r: 0.0045686336, g: 0.03291244, b: 0.13207549, a: 0}
         key4: {r: 0, g: 0, b: 0, a: 0}
         key5: {r: 0, g: 0, b: 0, a: 0}
         key6: {r: 0, g: 0, b: 0, a: 0}
         key7: {r: 0, g: 0, b: 0, a: 0}
-        ctime0: 8867
-        ctime1: 28527
-        ctime2: 47545
-        ctime3: 0
+        ctime0: 716
+        ctime1: 15365
+        ctime2: 37394
+        ctime3: 58321
         ctime4: 0
         ctime5: 0
         ctime6: 0
@@ -16174,7 +16184,7 @@ ParticleSystem:
         atime7: 0
         m_Mode: 0
         m_ColorSpace: 0
-        m_NumColorKeys: 3
+        m_NumColorKeys: 4
         m_NumAlphaKeys: 2
       minGradient:
         serializedVersion: 2
@@ -19843,8 +19853,8 @@ ParticleSystem:
     startSpeed:
       serializedVersion: 2
       minMaxState: 3
-      scalar: 10
-      minScalar: 1
+      scalar: 20
+      minScalar: 5
       maxCurve:
         serializedVersion: 2
         m_Curve:
@@ -21032,7 +21042,7 @@ ParticleSystem:
         m_RotationOrder: 4
     separateAxes: 0
   ColorModule:
-    enabled: 0
+    enabled: 1
     gradient:
       serializedVersion: 2
       minMaxState: 1
@@ -21041,7 +21051,7 @@ ParticleSystem:
       maxGradient:
         serializedVersion: 2
         key0: {r: 1, g: 1, b: 1, a: 1}
-        key1: {r: 1, g: 1, b: 1, a: 1}
+        key1: {r: 0, g: 0.29241246, b: 0.61185974, a: 1}
         key2: {r: 0, g: 0, b: 0, a: 0}
         key3: {r: 0, g: 0, b: 0, a: 0}
         key4: {r: 0, g: 0, b: 0, a: 0}
@@ -21065,7 +21075,7 @@ ParticleSystem:
         atime6: 0
         atime7: 0
         m_Mode: 0
-        m_ColorSpace: -1
+        m_ColorSpace: 0
         m_NumColorKeys: 2
         m_NumAlphaKeys: 2
       minGradient:
@@ -24682,7 +24692,7 @@ ParticleSystem:
     startLifetime:
       serializedVersion: 2
       minMaxState: 0
-      scalar: 0.3
+      scalar: 0.15
       minScalar: 0.1
       maxCurve:
         serializedVersion: 2
@@ -24853,7 +24863,7 @@ ParticleSystem:
     startSize:
       serializedVersion: 2
       minMaxState: 0
-      scalar: 0.63
+      scalar: 2.23
       minScalar: 0.5
       maxCurve:
         serializedVersion: 2
@@ -24906,7 +24916,7 @@ ParticleSystem:
     startSizeY:
       serializedVersion: 2
       minMaxState: 0
-      scalar: 1.2
+      scalar: 1.43
       minScalar: 1.3
       maxCurve:
         serializedVersion: 2
@@ -25172,7 +25182,7 @@ ParticleSystem:
     gravitySource: 0
     maxNumParticles: 10
     customEmitterVelocity: {x: 0, y: 0, z: 0}
-    size3D: 0
+    size3D: 1
     rotation3D: 0
     gravityModifier:
       serializedVersion: 2
@@ -25613,35 +25623,17 @@ ParticleSystem:
           time: 0
           value: 1
           inSlope: -2
-          outSlope: -0.31940293
-          tangentMode: 69
+          outSlope: -2
+          tangentMode: 0
           weightedMode: 0
           inWeight: 0
           outWeight: 0
-        - serializedVersion: 3
-          time: 0.2219941
-          value: 0.92909443
-          inSlope: -0.31940293
-          outSlope: -3.227366
-          tangentMode: 69
-          weightedMode: 0
-          inWeight: 0.33333334
-          outWeight: 0.33333334
-        - serializedVersion: 3
-          time: 0.47694147
-          value: 0.10628599
-          inSlope: -3.227366
-          outSlope: -0.20320095
-          tangentMode: 69
-          weightedMode: 0
-          inWeight: 0.33333334
-          outWeight: 0.33333334
         - serializedVersion: 3
           time: 1
           value: 0
-          inSlope: -0.20320095
+          inSlope: 0
           outSlope: 0
-          tangentMode: 69
+          tangentMode: 0
           weightedMode: 0
           inWeight: 0
           outWeight: 0
@@ -29422,7 +29414,7 @@ ParticleSystemRenderer:
   m_RenderingLayerMask: 1
   m_RendererPriority: 0
   m_Materials:
-  - {fileID: 2100000, guid: e5708de714f455d4b8298388201415a0, type: 2}
+  - {fileID: 2100000, guid: 5a7dae49b1059a948a89db022f673cb0, type: 2}
   m_StaticBatchInfo:
     firstSubMesh: 0
     subMeshCount: 0
@@ -29763,7 +29755,7 @@ ParticleSystem:
     startSize:
       serializedVersion: 2
       minMaxState: 0
-      scalar: 0.12
+      scalar: 0.16
       minScalar: 1
       maxCurve:
         serializedVersion: 2
@@ -30522,18 +30514,27 @@ ParticleSystem:
         - serializedVersion: 3
           time: 0
           value: 0
-          inSlope: 2
-          outSlope: 2
-          tangentMode: 0
+          inSlope: -2
+          outSlope: 2.898449
+          tangentMode: 69
           weightedMode: 0
           inWeight: 0
           outWeight: 0
+        - serializedVersion: 3
+          time: 0.27848148
+          value: 0.8071644
+          inSlope: 2.898449
+          outSlope: 0.2672636
+          tangentMode: 69
+          weightedMode: 0
+          inWeight: 0.33333334
+          outWeight: 0.33333334
         - serializedVersion: 3
           time: 1
           value: 1
-          inSlope: 0
+          inSlope: 0.2672636
           outSlope: 0
-          tangentMode: 0
+          tangentMode: 69
           weightedMode: 0
           inWeight: 0
           outWeight: 0
@@ -30844,7 +30845,7 @@ ParticleSystem:
         serializedVersion: 2
         key0: {r: 1, g: 1, b: 1, a: 0}
         key1: {r: 0, g: 0.14938524, b: 0.5283019, a: 1}
-        key2: {r: 1, g: 0.20529068, b: 0, a: 0}
+        key2: {r: 1, g: 0.20529068, b: 0, a: 0.9194965}
         key3: {r: 0, g: 0, b: 0, a: 0}
         key4: {r: 0, g: 0, b: 0, a: 0}
         key5: {r: 0, g: 0, b: 0, a: 0}
@@ -30860,8 +30861,8 @@ ParticleSystem:
         ctime7: 0
         atime0: 0
         atime1: 2827
-        atime2: 65535
-        atime3: 0
+        atime2: 43562
+        atime3: 65535
         atime4: 0
         atime5: 0
         atime6: 0
@@ -30869,7 +30870,7 @@ ParticleSystem:
         m_Mode: 0
         m_ColorSpace: 0
         m_NumColorKeys: 2
-        m_NumAlphaKeys: 3
+        m_NumAlphaKeys: 4
       minGradient:
         serializedVersion: 2
         key0: {r: 1, g: 1, b: 1, a: 1}

+ 16 - 13
Assets/Art/VFX/FXPrefabs/fx_gf_lieyanjian.prefab

@@ -1318,8 +1318,8 @@ ParticleSystem:
         key6: {r: 0, g: 0, b: 0, a: 0}
         key7: {r: 0, g: 0, b: 0, a: 0}
         ctime0: 26857
-        ctime1: 33667
-        ctime2: 63222
+        ctime1: 59312
+        ctime2: 65535
         ctime3: 0
         ctime4: 0
         ctime5: 0
@@ -5058,7 +5058,7 @@ ParticleSystem:
       serializedVersion: 2
       minMaxState: 0
       minColor: {r: 1, g: 1, b: 1, a: 1}
-      maxColor: {r: 1, g: 0.4997921, b: 0.41194963, a: 0.5372549}
+      maxColor: {r: 1, g: 0.4997921, b: 0.41194963, a: 0.2901961}
       maxGradient:
         serializedVersion: 2
         key0: {r: 1, g: 1, b: 1, a: 1}
@@ -19494,9 +19494,11 @@ MonoBehaviour:
   multipleTargetDelayTime: 0
   hitFxName: fx_gf_lieyanjian_hit
   hitAudioName: 
+  extraMoveSpeed: 0
   isPenetrate: 0
   isUseCustomTargetEndPos: 0
   customTargetEndPosIndex: 0
+  size: 1
   speed: 20
   parabolaCurveType: 1
   isTriggerGroundEnd: 0
@@ -19505,6 +19507,7 @@ MonoBehaviour:
   BesselPath:
     isActive: 0
     controlPoints: []
+    allDis: 0
   maxDis: 20
 --- !u!54 &9090830495027733959
 Rigidbody:
@@ -19633,17 +19636,17 @@ TrailRenderer:
       m_RotationOrder: 4
     colorGradient:
       serializedVersion: 2
-      key0: {r: 0.9685534, g: 0.08411373, b: 0, a: 1}
+      key0: {r: 0.97304577, g: 0.34985867, b: 0.077371426, a: 1}
       key1: {r: 0.51572317, g: 0.07979583, b: 0, a: 1}
-      key2: {r: 0.29559743, g: 0.0046477285, b: 0.014898627, a: 0}
+      key2: {r: 0.23450124, g: 0.017951787, b: 0.0009480846, a: 0}
       key3: {r: 0.29559743, g: 0.0046477285, b: 0.014898627, a: 0}
       key4: {r: 0, g: 0, b: 0, a: 0}
       key5: {r: 0, g: 0, b: 0, a: 0}
       key6: {r: 0, g: 0, b: 0, a: 0}
       key7: {r: 0, g: 0, b: 0, a: 0}
-      ctime0: 9381
-      ctime1: 13750
-      ctime2: 31354
+      ctime0: 0
+      ctime1: 8867
+      ctime2: 41138
       ctime3: 31354
       ctime4: 0
       ctime5: 0
@@ -19897,7 +19900,7 @@ ParticleSystem:
       serializedVersion: 2
       minMaxState: 0
       minColor: {r: 1, g: 0.14779866, b: 0.31108844, a: 1}
-      maxColor: {r: 0.9811321, g: 0.4760111, b: 0.36715314, a: 1}
+      maxColor: {r: 0.98039216, g: 0.98039216, b: 0.98039216, a: 1}
       maxGradient:
         serializedVersion: 2
         key0: {r: 1, g: 1, b: 1, a: 1}
@@ -20015,7 +20018,7 @@ ParticleSystem:
       serializedVersion: 2
       minMaxState: 3
       scalar: 0.1
-      minScalar: 0.3
+      minScalar: 0.2
       maxCurve:
         serializedVersion: 2
         m_Curve:
@@ -20720,8 +20723,8 @@ ParticleSystem:
         - serializedVersion: 3
           time: 0
           value: 1
-          inSlope: 0
-          outSlope: 0
+          inSlope: -2
+          outSlope: -2
           tangentMode: 0
           weightedMode: 0
           inWeight: 0
@@ -29713,7 +29716,7 @@ ParticleSystem:
       serializedVersion: 2
       minMaxState: 0
       minColor: {r: 1, g: 1, b: 1, a: 1}
-      maxColor: {r: 0.8490566, g: 0.23971988, b: 0.08276953, a: 0.28627452}
+      maxColor: {r: 0.8490566, g: 0.23971988, b: 0.08276953, a: 0.49019608}
       maxGradient:
         serializedVersion: 2
         key0: {r: 1, g: 1, b: 1, a: 1}

+ 77 - 68
Assets/Art/VFX/FXPrefabs/fx_gf_lieyanjian_hit.prefab

@@ -5117,7 +5117,7 @@ ParticleSystem:
       serializedVersion: 2
       minMaxState: 0
       minColor: {r: 1, g: 1, b: 1, a: 1}
-      maxColor: {r: 0.8616352, g: 0.18662673, b: 0.013547636, a: 0.28235295}
+      maxColor: {r: 1, g: 1, b: 1, a: 0.87058824}
       maxGradient:
         serializedVersion: 2
         key0: {r: 1, g: 1, b: 1, a: 1}
@@ -6260,24 +6260,24 @@ ParticleSystem:
       maxColor: {r: 1, g: 1, b: 1, a: 1}
       maxGradient:
         serializedVersion: 2
-        key0: {r: 0.99371064, g: 0.46922, b: 0.06562226, a: 0}
-        key1: {r: 0.9622642, g: 0.37508357, b: 0.045389697, a: 1}
-        key2: {r: 0.1254902, g: 0.010044841, b: 0.003921569, a: 0}
+        key0: {r: 0.89757407, g: 0.36598748, b: 0.08104775, a: 0}
+        key1: {r: 0.38544464, g: 0, b: 0.0059758886, a: 1}
+        key2: {r: 0.12668449, g: 0.008173193, b: 0, a: 0}
         key3: {r: 0.31446534, g: 0.04303377, b: 0, a: 0}
         key4: {r: 0, g: 0, b: 0, a: 0}
         key5: {r: 0, g: 0, b: 0, a: 0}
         key6: {r: 0, g: 0, b: 0, a: 0}
         key7: {r: 0, g: 0, b: 0, a: 0}
-        ctime0: 0
-        ctime1: 23387
-        ctime2: 63222
+        ctime0: 8426
+        ctime1: 20652
+        ctime2: 65535
         ctime3: 63222
         ctime4: 0
         ctime5: 0
         ctime6: 0
         ctime7: 0
         atime0: 0
-        atime1: 32511
+        atime1: 15585
         atime2: 65535
         atime3: 65535
         atime4: 0
@@ -6320,15 +6320,15 @@ ParticleSystem:
         m_NumAlphaKeys: 2
   UVModule:
     serializedVersion: 2
-    enabled: 0
+    enabled: 1
     mode: 0
     timeMode: 0
     fps: 30
     frameOverTime:
       serializedVersion: 2
-      minMaxState: 1
+      minMaxState: 3
       scalar: 0.9999
-      minScalar: 0.9999
+      minScalar: 0
       maxCurve:
         serializedVersion: 2
         m_Curve:
@@ -6431,8 +6431,8 @@ ParticleSystem:
         m_PostInfinity: 2
         m_RotationOrder: 4
     speedRange: {x: 0, y: 1}
-    tilesX: 4
-    tilesY: 4
+    tilesX: 2
+    tilesY: 2
     animationType: 0
     rowIndex: 0
     cycles: 1
@@ -9732,7 +9732,7 @@ ParticleSystemRenderer:
   m_RenderingLayerMask: 1
   m_RendererPriority: 0
   m_Materials:
-  - {fileID: 2100000, guid: cfeb09ef39a07fa41ad156a4eb55f870, type: 2}
+  - {fileID: 2100000, guid: 72d28eec7351de74b90a0215c9ee78f3, type: 2}
   m_StaticBatchInfo:
     firstSubMesh: 0
     subMeshCount: 0
@@ -10833,16 +10833,16 @@ ParticleSystem:
           time: 0
           value: 0
           inSlope: 2
-          outSlope: 5.0188274
+          outSlope: 3.3896887
           tangentMode: 69
           weightedMode: 0
           inWeight: 0.33333334
           outWeight: 0.33333334
         - serializedVersion: 3
-          time: 0.17827615
-          value: 0.89473724
-          inSlope: 5.0188274
-          outSlope: 0.12809992
+          time: 0.24020395
+          value: 0.8142166
+          inSlope: 3.3896887
+          outSlope: 0.24451745
           tangentMode: 69
           weightedMode: 0
           inWeight: 0.33333334
@@ -10850,7 +10850,7 @@ ParticleSystem:
         - serializedVersion: 3
           time: 1
           value: 1
-          inSlope: 0.12809992
+          inSlope: 0.24451745
           outSlope: 0
           tangentMode: 69
           weightedMode: 0
@@ -14797,7 +14797,7 @@ ParticleSystem:
   startDelay:
     serializedVersion: 2
     minMaxState: 0
-    scalar: 0.15
+    scalar: 0.1
     minScalar: 0
     maxCurve:
       serializedVersion: 2
@@ -15788,16 +15788,16 @@ ParticleSystem:
           time: 0
           value: 0
           inSlope: -2
-          outSlope: 4.5702596
+          outSlope: 5.0701914
           tangentMode: 69
           weightedMode: 0
           inWeight: 0
           outWeight: 0
         - serializedVersion: 3
-          time: 0.16691521
-          value: 0.7628458
-          inSlope: 4.5702596
-          outSlope: 0.2846699
+          time: 0.1719735
+          value: 0.8719385
+          inSlope: 5.0701914
+          outSlope: 0.15465866
           tangentMode: 69
           weightedMode: 0
           inWeight: 0.33333334
@@ -15805,7 +15805,7 @@ ParticleSystem:
         - serializedVersion: 3
           time: 1
           value: 1
-          inSlope: 0.2846699
+          inSlope: 0.15465866
           outSlope: 0
           tangentMode: 69
           weightedMode: 0
@@ -19581,7 +19581,7 @@ ParticleSystemRenderer:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 4351358226939347328}
-  m_Enabled: 1
+  m_Enabled: 0
   m_CastShadows: 0
   m_ReceiveShadows: 0
   m_DynamicOccludee: 1
@@ -21023,15 +21023,15 @@ ParticleSystem:
       maxGradient:
         serializedVersion: 2
         key0: {r: 0.7924528, g: 0.040370174, b: 0.040370174, a: 0}
-        key1: {r: 0.5283019, g: 0.0069775446, b: 0.017178554, a: 0.95292664}
+        key1: {r: 0.38544464, g: 0.08746166, b: 0.043115735, a: 0.95292664}
         key2: {r: 0.8280432, g: 0.10858049, b: 0.041295055, a: 0}
         key3: {r: 0.16981131, g: 0.008865016, b: 0.0022427822, a: 0}
         key4: {r: 0.115681715, g: 0.2813761, b: 0.9150943, a: 0}
         key5: {r: 0.3761953, g: 0.09740115, b: 0.9056604, a: 0}
         key6: {r: 0.9056604, g: 0.054681327, b: 0.8296877, a: 0}
         key7: {r: 0, g: 0, b: 0, a: 0}
-        ctime0: 8867
-        ctime1: 54741
+        ctime0: 2478
+        ctime1: 56118
         ctime2: 43176
         ctime3: 65535
         ctime4: 43754
@@ -21039,7 +21039,7 @@ ParticleSystem:
         ctime6: 65535
         ctime7: 0
         atime0: 0
-        atime1: 22937
+        atime1: 9638
         atime2: 65535
         atime3: 65535
         atime4: 65535
@@ -21047,7 +21047,7 @@ ParticleSystem:
         atime6: 0
         atime7: 0
         m_Mode: 0
-        m_ColorSpace: -1
+        m_ColorSpace: 0
         m_NumColorKeys: 2
         m_NumAlphaKeys: 3
       minGradient:
@@ -24664,7 +24664,7 @@ ParticleSystem:
     startLifetime:
       serializedVersion: 2
       minMaxState: 0
-      scalar: 0.3
+      scalar: 0.15
       minScalar: 0.2
       maxCurve:
         serializedVersion: 2
@@ -24771,7 +24771,7 @@ ParticleSystem:
       serializedVersion: 2
       minMaxState: 0
       minColor: {r: 0.2924528, g: 0.028236823, b: 0, a: 1}
-      maxColor: {r: 0.5345911, g: 0.09054262, b: 0, a: 1}
+      maxColor: {r: 0.92452824, g: 0.19741824, b: 0.048593786, a: 1}
       maxGradient:
         serializedVersion: 2
         key0: {r: 1, g: 1, b: 1, a: 1}
@@ -24835,7 +24835,7 @@ ParticleSystem:
     startSize:
       serializedVersion: 2
       minMaxState: 0
-      scalar: 5.53
+      scalar: 9
       minScalar: 2
       maxCurve:
         serializedVersion: 2
@@ -25593,19 +25593,28 @@ ParticleSystem:
         m_Curve:
         - serializedVersion: 3
           time: 0
-          value: 1
+          value: 0
           inSlope: -2
-          outSlope: -2
-          tangentMode: 0
+          outSlope: 2.2056913
+          tangentMode: 69
           weightedMode: 0
           inWeight: 0
           outWeight: 0
+        - serializedVersion: 3
+          time: 0.31766605
+          value: 0.7006733
+          inSlope: 2.2056913
+          outSlope: 0.43868068
+          tangentMode: 69
+          weightedMode: 0
+          inWeight: 0.33333334
+          outWeight: 0.33333334
         - serializedVersion: 3
           time: 1
-          value: 0
-          inSlope: 0
+          value: 1
+          inSlope: 0.43868068
           outSlope: 0
-          tangentMode: 0
+          tangentMode: 69
           weightedMode: 0
           inWeight: 0
           outWeight: 0
@@ -25906,7 +25915,7 @@ ParticleSystem:
         m_RotationOrder: 4
     separateAxes: 0
   ColorModule:
-    enabled: 0
+    enabled: 1
     gradient:
       serializedVersion: 2
       minMaxState: 1
@@ -25914,7 +25923,7 @@ ParticleSystem:
       maxColor: {r: 1, g: 1, b: 1, a: 1}
       maxGradient:
         serializedVersion: 2
-        key0: {r: 1, g: 1, b: 1, a: 0}
+        key0: {r: 0, g: 0, b: 0, a: 1}
         key1: {r: 1, g: 1, b: 1, a: 1}
         key2: {r: 0, g: 0, b: 0, a: 0}
         key3: {r: 0, g: 0, b: 0, a: 0}
@@ -25923,15 +25932,15 @@ ParticleSystem:
         key6: {r: 0.9056604, g: 0.054681327, b: 0.8296877, a: 0}
         key7: {r: 0.9056604, g: 0.054681327, b: 0.8296877, a: 0}
         ctime0: 0
-        ctime1: 65535
-        ctime2: 47802
+        ctime1: 5012
+        ctime2: 65535
         ctime3: 47802
         ctime4: 33539
         ctime5: 44333
         ctime6: 54356
         ctime7: 65535
         atime0: 0
-        atime1: 12208
+        atime1: 65535
         atime2: 65535
         atime3: 65535
         atime4: 0
@@ -25940,8 +25949,8 @@ ParticleSystem:
         atime7: 0
         m_Mode: 0
         m_ColorSpace: 0
-        m_NumColorKeys: 2
-        m_NumAlphaKeys: 3
+        m_NumColorKeys: 3
+        m_NumAlphaKeys: 2
       minGradient:
         serializedVersion: 2
         key0: {r: 1, g: 1, b: 1, a: 1}
@@ -29386,7 +29395,7 @@ ParticleSystemRenderer:
   m_RenderingLayerMask: 1
   m_RendererPriority: 0
   m_Materials:
-  - {fileID: 2100000, guid: 2d06d2696309118458729e1dc7b4a6b1, type: 2}
+  - {fileID: 2100000, guid: d998f339b6942ab47b72da35f68ef6dd, type: 2}
   m_StaticBatchInfo:
     firstSubMesh: 0
     subMeshCount: 0
@@ -29452,7 +29461,7 @@ GameObject:
   - component: {fileID: 5473851120351068764}
   m_Layer: 0
   m_HasEditorInfo: 1
-  m_Name: 010lz
+  m_Name: fx_lz1_al
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -29609,8 +29618,8 @@ ParticleSystem:
     startSpeed:
       serializedVersion: 2
       minMaxState: 3
-      scalar: 18
-      minScalar: 1
+      scalar: 30
+      minScalar: 5
       maxCurve:
         serializedVersion: 2
         m_Curve:
@@ -29663,7 +29672,7 @@ ParticleSystem:
       serializedVersion: 2
       minMaxState: 0
       minColor: {r: 1, g: 0.14779866, b: 0.31108844, a: 1}
-      maxColor: {r: 0.98742133, g: 0.7402968, b: 0.60549414, a: 1}
+      maxColor: {r: 0.98, g: 0.305221, b: 0.11857999, a: 1}
       maxGradient:
         serializedVersion: 2
         key0: {r: 1, g: 1, b: 1, a: 1}
@@ -29727,8 +29736,8 @@ ParticleSystem:
     startSize:
       serializedVersion: 2
       minMaxState: 3
-      scalar: 0.1
-      minScalar: 0.2
+      scalar: 0.15
+      minScalar: 0.3
       maxCurve:
         serializedVersion: 2
         m_Curve:
@@ -29780,8 +29789,8 @@ ParticleSystem:
     startSizeY:
       serializedVersion: 2
       minMaxState: 3
-      scalar: 0.2
-      minScalar: 0.6
+      scalar: 0.1
+      minScalar: 0.5
       maxCurve:
         serializedVersion: 2
         m_Curve:
@@ -30046,12 +30055,12 @@ ParticleSystem:
     gravitySource: 0
     maxNumParticles: 50
     customEmitterVelocity: {x: 0, y: 0, z: 0}
-    size3D: 1
+    size3D: 0
     rotation3D: 0
     gravityModifier:
       serializedVersion: 2
-      minMaxState: 1
-      scalar: 1
+      minMaxState: 0
+      scalar: 0.3
       minScalar: 0.1
       maxCurve:
         serializedVersion: 2
@@ -30420,7 +30429,7 @@ ParticleSystem:
       countCurve:
         serializedVersion: 2
         minMaxState: 0
-        scalar: 20
+        scalar: 30
         minScalar: 30
         maxCurve:
           serializedVersion: 2
@@ -30486,8 +30495,8 @@ ParticleSystem:
         - serializedVersion: 3
           time: 0
           value: 1
-          inSlope: 0
-          outSlope: 0
+          inSlope: -2
+          outSlope: -2
           tangentMode: 0
           weightedMode: 0
           inWeight: 0
@@ -30875,7 +30884,7 @@ ParticleSystem:
         m_NumAlphaKeys: 2
   UVModule:
     serializedVersion: 2
-    enabled: 0
+    enabled: 1
     mode: 0
     timeMode: 0
     fps: 30
@@ -32137,7 +32146,7 @@ ParticleSystem:
     inWorldSpace: 0
     multiplyDragByParticleSize: 1
     multiplyDragByParticleVelocity: 1
-    dampen: 0.15
+    dampen: 0.22
     drag:
       serializedVersion: 2
       minMaxState: 0
@@ -34287,7 +34296,7 @@ ParticleSystemRenderer:
   m_RenderingLayerMask: 1
   m_RendererPriority: 0
   m_Materials:
-  - {fileID: 2100000, guid: bb9676d9136cd0a419aca2b1546410df, type: 2}
+  - {fileID: 2100000, guid: f9a9bda34cc842d4f9c116f73daac6b7, type: 2}
   m_StaticBatchInfo:
     firstSubMesh: 0
     subMeshCount: 0
@@ -34315,7 +34324,7 @@ ParticleSystemRenderer:
   m_MaxParticleSize: 5
   m_CameraVelocityScale: 0
   m_VelocityScale: 0
-  m_LengthScale: -1
+  m_LengthScale: -2
   m_SortingFudge: 0
   m_NormalDirection: 1
   m_ShadowBias: 0

+ 9 - 9
Assets/Art/VFX/FXPrefabs/fx_gf_mozhan_hit.prefab

@@ -29468,7 +29468,7 @@ ParticleSystem:
     startLifetime:
       serializedVersion: 2
       minMaxState: 0
-      scalar: 0.5
+      scalar: 0.3
       minScalar: 5
       maxCurve:
         serializedVersion: 2
@@ -30450,9 +30450,9 @@ ParticleSystem:
         m_Curve:
         - serializedVersion: 3
           time: 0
-          value: 1
+          value: 0
           inSlope: 2
-          outSlope: -0.20561218
+          outSlope: 0.7943878
           tangentMode: 69
           weightedMode: 0
           inWeight: 0.33333334
@@ -30460,7 +30460,7 @@ ParticleSystem:
         - serializedVersion: 3
           time: 1
           value: 0.7943878
-          inSlope: -0.20561218
+          inSlope: 0.7943878
           outSlope: 0
           tangentMode: 69
           weightedMode: 0
@@ -39154,7 +39154,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!4 &9089117545459108445
 Transform:
   m_ObjectHideFlags: 0
@@ -45129,17 +45129,17 @@ ParticleSystem:
         m_Curve:
         - serializedVersion: 3
           time: 0
-          value: 1
+          value: 0
           inSlope: 2
-          outSlope: -0.20561218
+          outSlope: 1
           tangentMode: 69
           weightedMode: 0
           inWeight: 0.33333334
           outWeight: 0.33333334
         - serializedVersion: 3
           time: 1
-          value: 0.7943878
-          inSlope: -0.20561218
+          value: 1
+          inSlope: 1
           outSlope: 0
           tangentMode: 69
           weightedMode: 0

+ 6 - 2
Assets/Art/VFX/Materials/010_lz.mat

@@ -1,5 +1,5 @@
 %YAML 1.1
-%TAG !u! tag:unity3d.com,2011:
+%TAG !u! tag:yousandi.cn,2023:
 --- !u!21 &2100000
 Material:
   serializedVersion: 8
@@ -9,6 +9,8 @@ Material:
   m_PrefabAsset: {fileID: 0}
   m_Name: 010_lz
   m_Shader: {fileID: 4800000, guid: 200ef425a7d005549abec1d23f7393d2, type: 3}
+  m_Parent: {fileID: 0}
+  m_ModifiedSerializedProperties: 0
   m_ValidKeywords: []
   m_InvalidKeywords: []
   m_LightmapFlags: 4
@@ -17,6 +19,7 @@ Material:
   m_CustomRenderQueue: -1
   stringTagMap: {}
   disabledShaderPasses: []
+  m_LockedProperties: 
   m_SavedProperties:
     serializedVersion: 3
     m_TexEnvs:
@@ -60,8 +63,9 @@ Material:
     - _MainTexRotation: 0
     - _QueueControl: 0
     - _QueueOffset: 0
+    - _ca: 1
     m_Colors:
-    - _Color: {r: 13.76636, g: 2.5947068, b: 1.0090525, a: 1}
+    - _Color: {r: 16.100351, g: 2.8222902, b: 0.8462446, a: 1}
     - _EmissionColor: {r: 1, g: 1, b: 1, a: 1}
     - _Flip: {r: 1, g: 1, b: 1, a: 1}
     - _MainTexChannel: {r: 0, g: 0, b: 0, a: 1}

+ 138 - 0
Assets/Art/VFX/Materials/fx_add_glow.mat

@@ -0,0 +1,138 @@
+%YAML 1.1
+%TAG !u! tag:yousandi.cn,2023:
+--- !u!21 &2100000
+Material:
+  serializedVersion: 8
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: fx_add_glow
+  m_Shader: {fileID: 4800000, guid: ca5272cc9dc342a4eb82e46facb52483, type: 3}
+  m_Parent: {fileID: 0}
+  m_ModifiedSerializedProperties: 0
+  m_ValidKeywords: []
+  m_InvalidKeywords: []
+  m_LightmapFlags: 4
+  m_EnableInstancingVariants: 0
+  m_DoubleSidedGI: 0
+  m_CustomRenderQueue: -1
+  stringTagMap: {}
+  disabledShaderPasses: []
+  m_LockedProperties: 
+  m_SavedProperties:
+    serializedVersion: 3
+    m_TexEnvs:
+    - _BaseMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _BumpMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailAlbedoMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailMask:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailNormalMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _EmissionMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MainTex:
+        m_Texture: {fileID: 2800000, guid: 7211a0f9fb965394c9b04af1d9382b87, type: 3}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MetallicGlossMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _OcclusionMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _ParallaxMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _SpecGlossMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    m_Ints: []
+    m_Floats:
+    - _AlphaClip: 0
+    - _AlphaCutoff: 0.5
+    - _AlphaToMask: 0
+    - _Blend: 0
+    - _BlendModePreserveSpecular: 1
+    - _BumpScale: 1
+    - _ClearCoatMask: 0
+    - _ClearCoatSmoothness: 0
+    - _Cull: 2
+    - _Cutoff: 0.5
+    - _DetailAlbedoMapScale: 1
+    - _DetailNormalMapScale: 1
+    - _DstBlend: 0
+    - _DstBlendAlpha: 0
+    - _EnvironmentReflections: 1
+    - _GlossMapScale: 0
+    - _Glossiness: 0
+    - _GlossyReflections: 0
+    - _Intensity: 1
+    - _MainTexRotation: 0
+    - _Metallic: 0
+    - _OcclusionStrength: 1
+    - _Parallax: 0.005
+    - _QueueControl: 0
+    - _QueueOffset: 0
+    - _ReceiveShadows: 1
+    - _Smoothness: 0.5
+    - _SmoothnessTextureChannel: 0
+    - _SpecularHighlights: 1
+    - _SrcBlend: 1
+    - _SrcBlendAlpha: 1
+    - _Surface: 0
+    - _WorkflowMode: 1
+    - _ZWrite: 1
+    - _ca: 1
+    m_Colors:
+    - _BaseColor: {r: 1, g: 1, b: 1, a: 1}
+    - _Color: {r: 3.2490096, g: 3.2490096, b: 3.2490096, a: 1}
+    - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
+    - _MainTexChannel: {r: 1, g: 0, b: 0, a: 0}
+    - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
+  m_BuildTextureStacks: []
+--- !u!114 &6481248883332920201
+MonoBehaviour:
+  m_ObjectHideFlags: 11
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  version: 7

+ 8 - 0
Assets/Art/VFX/Materials/fx_add_glow.mat.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: W3MWvXyuUHJG8CPewL7lajpGpMZEKHSmjJl6DSfI9fbjmlnMxjCoCDBPjLoR
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 2100000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 112 - 0
Assets/Art/VFX/Materials/fx_bd_shizi_bai.mat

@@ -0,0 +1,112 @@
+%YAML 1.1
+%TAG !u! tag:yousandi.cn,2023:
+--- !u!21 &2100000
+Material:
+  serializedVersion: 8
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: fx_bd_shizi_bai
+  m_Shader: {fileID: 4800000, guid: 73c6e6bc3c5577f4198f4dd9a22b048f, type: 3}
+  m_Parent: {fileID: 0}
+  m_ModifiedSerializedProperties: 0
+  m_ValidKeywords: []
+  m_InvalidKeywords: []
+  m_LightmapFlags: 4
+  m_EnableInstancingVariants: 0
+  m_DoubleSidedGI: 0
+  m_CustomRenderQueue: -1
+  stringTagMap: {}
+  disabledShaderPasses: []
+  m_LockedProperties: 
+  m_SavedProperties:
+    serializedVersion: 3
+    m_TexEnvs:
+    - _AlphaTex:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MainTex:
+        m_Texture: {fileID: 2800000, guid: aff3775489daf7a4dae83b78fa82767a, type: 3}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _Main_Tex:
+        m_Texture: {fileID: 2800000, guid: cf6d51334ac6516478eb1837fd853767, type: 3}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _Mask:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MaskTex:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _NormalMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _Ramp:
+        m_Texture: {fileID: 2800000, guid: 113ada0ea9ae0294f97d0a1c1f02e0dc, type: 3}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _Turb_Noise:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _dissolve:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _texcoord:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    m_Ints: []
+    m_Floats:
+    - _Alpha: 1
+    - _AlphaCutoff: 0.5
+    - _CTime: 1
+    - _CustomDataDissolve: 0
+    - _CustomDataMainUV: 0
+    - _CustomDataMainUV1: 0
+    - _Diss_value: 0
+    - _EnableExternalAlpha: 0
+    - _Light: 1
+    - _QueueControl: 0
+    - _QueueOffset: 0
+    - _RampONOff: 0
+    - _RampOneMinus: 0
+    - _RampPower: 1
+    - _RampUVCtrl: 0
+    - _RampUVTiling: 0
+    - _RampUVoffset: 0
+    - _Soft_value: 0
+    - _Turb_Value: 0
+    - _ca: 1
+    - _light: 3
+    - _rampUVsub: 0.11
+    m_Colors:
+    - _Color: {r: 1.9766743, g: 1.9766743, b: 1.9766743, a: 1}
+    - _Diss_UV: {r: 0, g: 0, b: 0, a: 0}
+    - _EmissionColor: {r: 1, g: 1, b: 1, a: 1}
+    - _Flip: {r: 1, g: 1, b: 1, a: 1}
+    - _Main_Color: {r: 3.9533489, g: 3.9533489, b: 3.9533489, a: 1}
+    - _Main_UV: {r: 0, g: 0, b: 0, a: 0}
+    - _Mask_UV: {r: 0, g: 0, b: 0, a: 0}
+    - _RendererColor: {r: 1, g: 1, b: 1, a: 1}
+    - _Turb_UV: {r: 0, g: 0, b: 0, a: 0}
+  m_BuildTextureStacks: []

+ 8 - 0
Assets/Art/VFX/Materials/fx_bd_shizi_bai.mat.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: CisY4Xv4V3KWz6NESnXTEkvs2VsMhNVmwSF91093jpIOqbbIG0L8/XG9MeGL
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 2100000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 3 - 3
Assets/Art/VFX/Materials/fx_frenel_lieyanjian.mat

@@ -143,7 +143,7 @@ Material:
     - _FlatSpecularSize: 0.1
     - _Flatness: 1
     - _FlatnessExtra: 1
-    - _Fresnel: 2
+    - _Fresnel: 1.5
     - _GlossMapScale: 0
     - _Glossiness: 0
     - _GlossyReflections: 0
@@ -195,7 +195,7 @@ Material:
     - _ZWrite: 0
     m_Colors:
     - _BaseColor: {r: 1, g: 0.9716981, b: 0.9716981, a: 1}
-    - _Base_Map_Color: {r: 0.9490196, g: 0.11888821, b: 0.02745096, a: 1}
+    - _Base_Map_Color: {r: 0.95687324, g: 0.26133224, b: 0.08640225, a: 1}
     - _Color: {r: 1, g: 0, b: 0, a: 1}
     - _ColorDim: {r: 1, g: 1, b: 1, a: 1}
     - _ColorDimCurve: {r: 0.85023, g: 0.85034, b: 0.8504499, a: 0.85056}
@@ -206,7 +206,7 @@ Material:
     - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
     - _FlatRimColor: {r: 0.85023, g: 0.85034, b: 0.85045, a: 0.85056}
     - _FlatSpecularColor: {r: 0.85023, g: 0.85034, b: 0.85045, a: 0.85056}
-    - _FresnelColor: {r: 6.6973615, g: 0.60041255, b: 0.2737903, a: 1}
+    - _FresnelColor: {r: 3.9533489, g: 0.35441422, b: 0.16161418, a: 1}
     - _LightmapDirection: {r: 0, g: 1, b: 0, a: 0}
     - _OutlineColor: {r: 0, g: 0, b: 0, a: 1}
     - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}

+ 1 - 1
Assets/Art/VFX/Materials/fx_lz1_al.mat

@@ -152,7 +152,7 @@ Material:
     - _WorkflowMode: 1
     - _ZWrite: 1
     - _ca: 1
-    - _light: 1
+    - _light: 2
     m_Colors:
     - _BaseColor: {r: 1, g: 1, b: 1, a: 1}
     - _Color: {r: 1, g: 1, b: 1, a: 1}

+ 1 - 1
Assets/Art/VFX/Materials/fx_xl_huo5.mat

@@ -143,7 +143,7 @@ Material:
     - _Color: {r: 1, g: 1, b: 1, a: 1}
     - _Diss_UV: {r: 0, g: 0, b: 0, a: 0}
     - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
-    - _Main_Color: {r: 1.319508, g: 1.319508, b: 1.319508, a: 1}
+    - _Main_Color: {r: 2.79544, g: 2.79544, b: 2.79544, a: 1}
     - _Main_UV: {r: 0, g: 0, b: 0, a: 0}
     - _Mask_UV: {r: 0, g: 0, b: 0, a: 0}
     - _SpecColor: {r: 0.2, g: 0.2, b: 0.2, a: 1}

+ 2 - 2
Assets/Art/VFX/Mesh/bingzhui1/mesh_bingzhui1.mat

@@ -195,7 +195,7 @@ Material:
     - _ZWrite: 0
     m_Colors:
     - _BaseColor: {r: 1, g: 0.9716981, b: 0.9716981, a: 1}
-    - _Base_Map_Color: {r: 0.19811308, g: 0.6499602, b: 1, a: 1}
+    - _Base_Map_Color: {r: 0.67250663, g: 0.85712296, b: 0.99999994, a: 1}
     - _Color: {r: 1, g: 0, b: 0, a: 1}
     - _ColorDim: {r: 1, g: 1, b: 1, a: 1}
     - _ColorDimCurve: {r: 0.85023, g: 0.85034, b: 0.8504499, a: 0.85056}
@@ -206,7 +206,7 @@ Material:
     - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
     - _FlatRimColor: {r: 0.85023, g: 0.85034, b: 0.85045, a: 0.85056}
     - _FlatSpecularColor: {r: 0.85023, g: 0.85034, b: 0.85045, a: 0.85056}
-    - _FresnelColor: {r: 0, g: 0.39798632, b: 2.1383643, a: 1}
+    - _FresnelColor: {r: 0.9229508, g: 2.1674297, b: 7.525606, a: 1}
     - _LightmapDirection: {r: 0, g: 1, b: 0, a: 0}
     - _OutlineColor: {r: 0, g: 0, b: 0, a: 1}
     - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}

BIN
Assets/Art/VFX/Textures/fx_bd1_bai.png


+ 133 - 0
Assets/Art/VFX/Textures/fx_bd1_bai.png.meta

@@ -0,0 +1,133 @@
+fileFormatVersion: 2
+guid: XCwZ4S+sUHhKUlhpoEgaNfj//DGR/in+S2eGNGTuFYfBaqTfyMugit7c4KUH
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 13
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+    flipGreenChannel: 0
+  isReadable: 0
+  webStreaming: 0
+  priorityLevel: 0
+  uploadedMode: 2
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  ignoreMipmapLimit: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
+    wrapU: 0
+    wrapV: 0
+    wrapW: 0
+  nPOTScale: 1
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 0
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 0
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  swizzle: 50462976
+  cookieLightType: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Server
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    nameFileIdTable: {}
+  mipmapLimitGroupName: 
+  pSDRemoveMatte: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 194 - 701
Assets/Art/cs3.scene


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

@@ -0,0 +1,277 @@
+%YAML 1.1
+%TAG !u! tag:yousandi.cn,2023:
+--- !u!1 &2586944165049089298
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 5603251483434550935}
+  - component: {fileID: 7483920492279363149}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: LevelBattle01
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &5603251483434550935
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2586944165049089298}
+  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: 3874186678662227420}
+  m_Father: {fileID: 0}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &7483920492279363149
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2586944165049089298}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 9970cf7521114b5ebfee32908aec5603, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  dec: "\u7B2C\u4E00\u5173\u7684\u6D4B\u8BD5\u573A\u666F"
+  roadside:
+    dis: 0.1
+    minCount: 10
+    maxCount: 15
+    SceneObjectConfigs:
+    - odds: 60
+      minY: -10
+      maxY: -3
+      prefab: {fileID: 7123144361424570747, guid: 8af965d3c361bfc4c9fdcd7b85c19600, type: 3}
+  roadside_1:
+    dis: 0.1
+    minCount: 10
+    maxCount: 15
+    SceneObjectConfigs:
+    - odds: 60
+      minY: 0
+      maxY: 2
+      prefab: {fileID: 7123144361424570747, guid: 8af965d3c361bfc4c9fdcd7b85c19600, type: 3}
+  button:
+    dis: 0.1
+    minCount: 2
+    maxCount: 5
+    SceneObjectConfigs:
+    - odds: 60
+      minY: -13
+      maxY: -10
+      prefab: {fileID: 7123144361424570747, guid: 8af965d3c361bfc4c9fdcd7b85c19600, type: 3}
+  skyObejct: {fileID: 8635193522516608795}
+--- !u!1001 &881047069771566859
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    serializedVersion: 3
+    m_TransformParent: {fileID: 5603251483434550935}
+    m_Modifications:
+    - target: {fileID: 1398171176346647818, guid: 600addf310c15f74da80c081c179e5c2, type: 3}
+      propertyPath: m_LocalScale.x
+      value: 1000
+      objectReference: {fileID: 0}
+    - target: {fileID: 1398171176346647818, guid: 600addf310c15f74da80c081c179e5c2, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1398171176346647818, guid: 600addf310c15f74da80c081c179e5c2, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4177647096219069143, guid: 600addf310c15f74da80c081c179e5c2, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4177647096219069143, guid: 600addf310c15f74da80c081c179e5c2, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4177647096219069143, guid: 600addf310c15f74da80c081c179e5c2, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4177647096219069143, guid: 600addf310c15f74da80c081c179e5c2, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 4177647096219069143, guid: 600addf310c15f74da80c081c179e5c2, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4177647096219069143, guid: 600addf310c15f74da80c081c179e5c2, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4177647096219069143, guid: 600addf310c15f74da80c081c179e5c2, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4177647096219069143, guid: 600addf310c15f74da80c081c179e5c2, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4177647096219069143, guid: 600addf310c15f74da80c081c179e5c2, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4177647096219069143, guid: 600addf310c15f74da80c081c179e5c2, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4762318038508566971, guid: 600addf310c15f74da80c081c179e5c2, type: 3}
+      propertyPath: worldSize.x
+      value: 1000
+      objectReference: {fileID: 0}
+    - target: {fileID: 5360880237618302960, guid: 600addf310c15f74da80c081c179e5c2, type: 3}
+      propertyPath: m_Mesh
+      value: 
+      objectReference: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
+    - target: {fileID: 5646907003157828046, guid: 600addf310c15f74da80c081c179e5c2, type: 3}
+      propertyPath: m_LocalScale.x
+      value: 400.00003
+      objectReference: {fileID: 0}
+    - target: {fileID: 5646907003157828046, guid: 600addf310c15f74da80c081c179e5c2, type: 3}
+      propertyPath: m_LocalScale.y
+      value: 400.00003
+      objectReference: {fileID: 0}
+    - target: {fileID: 5646907003157828046, guid: 600addf310c15f74da80c081c179e5c2, type: 3}
+      propertyPath: m_LocalScale.z
+      value: 400.00003
+      objectReference: {fileID: 0}
+    - target: {fileID: 5646907003157828046, guid: 600addf310c15f74da80c081c179e5c2, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5646907003157828046, guid: 600addf310c15f74da80c081c179e5c2, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6899256924629427720, guid: 600addf310c15f74da80c081c179e5c2, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6899256924629427720, guid: 600addf310c15f74da80c081c179e5c2, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8929588464290711568, guid: 600addf310c15f74da80c081c179e5c2, type: 3}
+      propertyPath: m_Name
+      value: cj01 (1)
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+    m_RemovedGameObjects: []
+    m_AddedGameObjects:
+    - targetCorrespondingSourceObject: {fileID: 4177647096219069143, guid: 600addf310c15f74da80c081c179e5c2, type: 3}
+      insertIndex: -1
+      addedObject: {fileID: 3109410496266473067}
+    m_AddedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: 600addf310c15f74da80c081c179e5c2, type: 3}
+--- !u!4 &3874186678662227420 stripped
+Transform:
+  m_CorrespondingSourceObject: {fileID: 4177647096219069143, guid: 600addf310c15f74da80c081c179e5c2, type: 3}
+  m_PrefabInstance: {fileID: 881047069771566859}
+  m_PrefabAsset: {fileID: 0}
+--- !u!1 &8635193522516608795 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 8929588464290711568, guid: 600addf310c15f74da80c081c179e5c2, type: 3}
+  m_PrefabInstance: {fileID: 881047069771566859}
+  m_PrefabAsset: {fileID: 0}
+--- !u!1001 &3219054633467570560
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    serializedVersion: 3
+    m_TransformParent: {fileID: 3874186678662227420}
+    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
+      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: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: f61d564ea9bfa194f9adebd3e1caf520, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: -0.0009873678
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: f61d564ea9bfa194f9adebd3e1caf520, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: 0.0009873678
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: f61d564ea9bfa194f9adebd3e1caf520, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: -0.7071061
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: f61d564ea9bfa194f9adebd3e1caf520, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: -0.7071061
+      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: -180.16
+      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 (1)
+      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 &3109410496266473067 stripped
+Transform:
+  m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: f61d564ea9bfa194f9adebd3e1caf520, type: 3}
+  m_PrefabInstance: {fileID: 3219054633467570560}
+  m_PrefabAsset: {fileID: 0}

+ 1 - 1
Assets/Res/LevelSecne/LevelBattle1.prefab.meta → Assets/Res/CombatScenes/LevelBattle01.prefab.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: DC8d5H7+AHmQ1aPd+Wn9LLQGTA/eJqCty7h3LQs4tURoofY/cUKA89o=
+guid: WyxMvHmrB3sUTC24BUBjH6vjk1P7tjN9pIIBWcxLvFFoMOTvPCkseuTKOIe9
 PrefabImporter:
   externalObjects: {}
   userData: 

+ 0 - 66
Assets/Res/CombatScenes/NavMeshTarget.prefab

@@ -1,66 +0,0 @@
-%YAML 1.1
-%TAG !u! tag:yousandi.cn,2023:
---- !u!1 &6358096024552388196
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 7
-  m_Component:
-  - component: {fileID: 1874478833208555005}
-  - component: {fileID: 8903864963971255426}
-  m_Layer: 0
-  m_HasEditorInfo: 1
-  m_Name: NavMeshTarget
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!4 &1874478833208555005
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 6358096024552388196}
-  serializedVersion: 2
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 17.1}
-  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!114 &8903864963971255426
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 6358096024552388196}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 7a5ac11cc976e418e8d13136b07e1f52, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_AgentTypeID: 0
-  m_CollectObjects: 1
-  m_Size: {x: 69.6, y: 10, z: 200}
-  m_Center: {x: 0, y: 2, z: 0}
-  m_LayerMask:
-    serializedVersion: 2
-    m_Bits: 128
-  m_UseGeometry: 1
-  m_DefaultArea: 0
-  m_GenerateLinks: 0
-  m_IgnoreNavMeshAgent: 1
-  m_IgnoreNavMeshObstacle: 1
-  m_OverrideTileSize: 0
-  m_TileSize: 256
-  m_OverrideVoxelSize: 0
-  m_VoxelSize: 0.16666667
-  m_MinRegionArea: 2
-  m_NavMeshData: {fileID: 23800000, guid: cb7f778af03b16442ba0d78f4985ca01, type: 2}
-  m_BuildHeightMesh: 0

+ 0 - 1289
Assets/Res/LevelSecne/LevelBattle1.prefab

@@ -1,1289 +0,0 @@
-%YAML 1.1
-%TAG !u! tag:yousandi.cn,2023:
---- !u!1 &280866919276522893
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 7
-  m_Component:
-  - component: {fileID: 5496476638502009937}
-  - component: {fileID: 4565069964655558225}
-  - component: {fileID: 5001841208341194587}
-  - component: {fileID: 1312737278143350904}
-  m_Layer: 0
-  m_HasEditorInfo: 1
-  m_Name: "\u5730\u9762"
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!4 &5496476638502009937
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 280866919276522893}
-  serializedVersion: 2
-  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 0, y: -1.21, z: 0}
-  m_LocalScale: {x: 1000, y: 1, z: 1000}
-  m_ConstrainProportionsScale: 0
-  m_Children: []
-  m_Father: {fileID: 5358946683605546402}
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!33 &4565069964655558225
-MeshFilter:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 280866919276522893}
-  m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0}
---- !u!23 &5001841208341194587
-MeshRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 280866919276522893}
-  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: 1388b1b9d8e6e094f8200ed6165c226d, 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!64 &1312737278143350904
-MeshCollider:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 280866919276522893}
-  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: 0
-  serializedVersion: 5
-  m_Convex: 0
-  m_CookingOptions: 30
-  m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0}
---- !u!1 &377022699561281216
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 7
-  m_Component:
-  - component: {fileID: 7987809570103549873}
-  - component: {fileID: 5312008026256136502}
-  - component: {fileID: 7264611672409628591}
-  - component: {fileID: 2074223323263674713}
-  m_Layer: 0
-  m_HasEditorInfo: 1
-  m_Name: "\u4E91"
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 0
---- !u!4 &7987809570103549873
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 377022699561281216}
-  serializedVersion: 2
-  m_LocalRotation: {x: 0.7071068, y: -0, z: -0, w: 0.7071068}
-  m_LocalPosition: {x: 0, y: 4.14, z: 0}
-  m_LocalScale: {x: 100, y: 100, z: 30}
-  m_ConstrainProportionsScale: 0
-  m_Children: []
-  m_Father: {fileID: 5358946683605546402}
-  m_LocalEulerAnglesHint: {x: 90, y: 0, z: 0}
---- !u!33 &5312008026256136502
-MeshFilter:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 377022699561281216}
-  m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0}
---- !u!23 &7264611672409628591
-MeshRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 377022699561281216}
-  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: 64b88e5f42b092c479a01277550690b3, 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!64 &2074223323263674713
-MeshCollider:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 377022699561281216}
-  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: 0
-  serializedVersion: 5
-  m_Convex: 0
-  m_CookingOptions: 30
-  m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0}
---- !u!1 &2583360796260655289
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 7
-  m_Component:
-  - component: {fileID: 5358946683605546402}
-  - component: {fileID: 7674354437582351306}
-  m_Layer: 0
-  m_HasEditorInfo: 1
-  m_Name: LevelBattle1
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!4 &5358946683605546402
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2583360796260655289}
-  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: 5102730601783122671}
-  - {fileID: 7584661881121843661}
-  - {fileID: 577796752425535151}
-  - {fileID: 7307561920632149905}
-  - {fileID: 8164440565147112126}
-  - {fileID: 3038281843829960415}
-  - {fileID: 749609443525787432}
-  - {fileID: 1960879749327801592}
-  - {fileID: 4892434117245881322}
-  - {fileID: 2828888882943533858}
-  - {fileID: 7987809570103549873}
-  - {fileID: 5496476638502009937}
-  - {fileID: 2785026401867800164}
-  - {fileID: 6982016546626449480}
-  m_Father: {fileID: 0}
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!114 &7674354437582351306
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2583360796260655289}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: e11c76896c7c4fbfaa5c0ef5cbd1694b, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  heroPoint:
-  - {fileID: 2785026401867800164}
-  allNodeConfig:
-  - {fileID: 251908915526426291}
---- !u!1 &2903338098812254835
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 7
-  m_Component:
-  - component: {fileID: 2785026401867800164}
-  m_Layer: 0
-  m_HasEditorInfo: 1
-  m_Name: heroPoint
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!4 &2785026401867800164
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2903338098812254835}
-  serializedVersion: 2
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 5, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_ConstrainProportionsScale: 0
-  m_Children: []
-  m_Father: {fileID: 5358946683605546402}
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!1 &4650491210985700125
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 7
-  m_Component:
-  - component: {fileID: 6982016546626449480}
-  - component: {fileID: 251908915526426291}
-  m_Layer: 0
-  m_HasEditorInfo: 1
-  m_Name: heroPoint (1)
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!4 &6982016546626449480
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 4650491210985700125}
-  serializedVersion: 2
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 5, z: 20}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_ConstrainProportionsScale: 0
-  m_Children: []
-  m_Father: {fileID: 5358946683605546402}
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!114 &251908915526426291
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 4650491210985700125}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 1b95bab1ff574b25b7452c484940ec20, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  monsterPoint:
-  - {fileID: 6982016546626449480}
-  targetMoveStartPoint: {fileID: 6982016546626449480}
---- !u!1 &5342095806027432577
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 7
-  m_Component:
-  - component: {fileID: 5102730601783122671}
-  - component: {fileID: 4237119297199637215}
-  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!4 &5102730601783122671
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 5342095806027432577}
-  serializedVersion: 2
-  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: -7.722524, y: 3.7070894, z: 33.541073}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_ConstrainProportionsScale: 0
-  m_Children: []
-  m_Father: {fileID: 5358946683605546402}
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!114 &4237119297199637215
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 5342095806027432577}
-  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: a024a20ca0d0cae468202914ff5e6a29, type: 2}
---- !u!1 &6836583772090547383
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 7
-  m_Component:
-  - component: {fileID: 2828888882943533858}
-  - component: {fileID: 3296217296975845550}
-  - component: {fileID: 6237905948643113002}
-  - component: {fileID: 5399096534795299690}
-  m_Layer: 0
-  m_HasEditorInfo: 1
-  m_Name: Fog
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 0
---- !u!4 &2828888882943533858
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 6836583772090547383}
-  serializedVersion: 2
-  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 0, y: 4, z: 0}
-  m_LocalScale: {x: 1000, y: 10, z: 1000}
-  m_ConstrainProportionsScale: 0
-  m_Children: []
-  m_Father: {fileID: 5358946683605546402}
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!33 &3296217296975845550
-MeshFilter:
-  m_ObjectHideFlags: 2
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 6836583772090547383}
-  m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
---- !u!23 &6237905948643113002
-MeshRenderer:
-  m_ObjectHideFlags: 2
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 6836583772090547383}
-  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: ee03aa8681ebe874e83beb71f8daf294, 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 &5399096534795299690
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 6836583772090547383}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 334f5cfa565f62949a853f351ccdb316, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  fogType: 6
-  fogMin: 5
-  fogMax: 46.32
-  _fogDepth: 41.32
-  secFogMin: 0
-  secFogMax: 1
-  worldSize: {x: 1000, y: 10, z: 1000}
-  fogFalloffType: 0
-  fogFalloffCurve: 0.5
-  sortingLayer: Default
-  sortingOrder: 0
-  renderingLayerMask: 4294967295
-  fogColor: {r: 0.403202, g: 0.76605386, b: 0.898, a: 0.9490196}
-  blendType: 0
-  fogMeshType: 0
-  customMesh: {fileID: 0}
-  fogClipping: 0
-  renderMode: 1
-  affectedByLights: 1
-  lightScatteringFactor: 0.537
-  lightReflectivity: 0.276
-  lightTransmission: 0.299
---- !u!1001 &922846491962061453
-PrefabInstance:
-  m_ObjectHideFlags: 0
-  serializedVersion: 2
-  m_Modification:
-    serializedVersion: 3
-    m_TransformParent: {fileID: 5358946683605546402}
-    m_Modifications:
-    - target: {fileID: 1727388020353400437, guid: a445053e76baa4740a148b2a7e0c84ae, type: 3}
-      propertyPath: m_LocalScale.x
-      value: 0.8920098
-      objectReference: {fileID: 0}
-    - target: {fileID: 1727388020353400437, guid: a445053e76baa4740a148b2a7e0c84ae, type: 3}
-      propertyPath: m_LocalScale.y
-      value: 0.8920099
-      objectReference: {fileID: 0}
-    - target: {fileID: 1727388020353400437, guid: a445053e76baa4740a148b2a7e0c84ae, type: 3}
-      propertyPath: m_LocalScale.z
-      value: 1.797487
-      objectReference: {fileID: 0}
-    - target: {fileID: 1727388020353400437, guid: a445053e76baa4740a148b2a7e0c84ae, type: 3}
-      propertyPath: m_LocalPosition.x
-      value: -18.3
-      objectReference: {fileID: 0}
-    - target: {fileID: 1727388020353400437, guid: a445053e76baa4740a148b2a7e0c84ae, type: 3}
-      propertyPath: m_LocalPosition.y
-      value: -7.13
-      objectReference: {fileID: 0}
-    - target: {fileID: 1727388020353400437, guid: a445053e76baa4740a148b2a7e0c84ae, type: 3}
-      propertyPath: m_LocalPosition.z
-      value: 81
-      objectReference: {fileID: 0}
-    - target: {fileID: 1727388020353400437, guid: a445053e76baa4740a148b2a7e0c84ae, type: 3}
-      propertyPath: m_LocalRotation.w
-      value: 0.2712122
-      objectReference: {fileID: 0}
-    - target: {fileID: 1727388020353400437, guid: a445053e76baa4740a148b2a7e0c84ae, type: 3}
-      propertyPath: m_LocalRotation.x
-      value: -0.2712122
-      objectReference: {fileID: 0}
-    - target: {fileID: 1727388020353400437, guid: a445053e76baa4740a148b2a7e0c84ae, type: 3}
-      propertyPath: m_LocalRotation.y
-      value: 0.6530268
-      objectReference: {fileID: 0}
-    - target: {fileID: 1727388020353400437, guid: a445053e76baa4740a148b2a7e0c84ae, type: 3}
-      propertyPath: m_LocalRotation.z
-      value: 0.6530268
-      objectReference: {fileID: 0}
-    - target: {fileID: 1727388020353400437, guid: a445053e76baa4740a148b2a7e0c84ae, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.x
-      value: -90
-      objectReference: {fileID: 0}
-    - target: {fileID: 1727388020353400437, guid: a445053e76baa4740a148b2a7e0c84ae, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 1727388020353400437, guid: a445053e76baa4740a148b2a7e0c84ae, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.z
-      value: 134.892
-      objectReference: {fileID: 0}
-    - target: {fileID: 6234654564258816952, guid: a445053e76baa4740a148b2a7e0c84ae, type: 3}
-      propertyPath: m_CastShadows
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 6234654564258816952, guid: a445053e76baa4740a148b2a7e0c84ae, type: 3}
-      propertyPath: m_Materials.Array.data[0]
-      value: 
-      objectReference: {fileID: 2100000, guid: 606198080c63f6248aa7119c3ad67bfc, type: 2}
-    - target: {fileID: 6234654564258816952, guid: a445053e76baa4740a148b2a7e0c84ae, type: 3}
-      propertyPath: m_Materials.Array.data[1]
-      value: 
-      objectReference: {fileID: 2100000, guid: 606198080c63f6248aa7119c3ad67bfc, type: 2}
-    - target: {fileID: 8263401684857855702, guid: a445053e76baa4740a148b2a7e0c84ae, type: 3}
-      propertyPath: m_Name
-      value: shan1 (6)
-      objectReference: {fileID: 0}
-    - target: {fileID: 8263401684857855702, guid: a445053e76baa4740a148b2a7e0c84ae, type: 3}
-      propertyPath: m_Layer
-      value: 10
-      objectReference: {fileID: 0}
-    - target: {fileID: 8263401684857855702, guid: a445053e76baa4740a148b2a7e0c84ae, type: 3}
-      propertyPath: m_TagString
-      value: dimian
-      objectReference: {fileID: 0}
-    m_RemovedComponents: []
-    m_RemovedGameObjects: []
-    m_AddedGameObjects: []
-    m_AddedComponents: []
-  m_SourcePrefab: {fileID: 100100000, guid: a445053e76baa4740a148b2a7e0c84ae, type: 3}
---- !u!4 &1960879749327801592 stripped
-Transform:
-  m_CorrespondingSourceObject: {fileID: 1727388020353400437, guid: a445053e76baa4740a148b2a7e0c84ae, type: 3}
-  m_PrefabInstance: {fileID: 922846491962061453}
-  m_PrefabAsset: {fileID: 0}
---- !u!1001 &2134652972889276765
-PrefabInstance:
-  m_ObjectHideFlags: 0
-  serializedVersion: 2
-  m_Modification:
-    serializedVersion: 3
-    m_TransformParent: {fileID: 5358946683605546402}
-    m_Modifications:
-    - target: {fileID: 1727388020353400437, guid: a445053e76baa4740a148b2a7e0c84ae, type: 3}
-      propertyPath: m_LocalScale.x
-      value: 0.8920098
-      objectReference: {fileID: 0}
-    - target: {fileID: 1727388020353400437, guid: a445053e76baa4740a148b2a7e0c84ae, type: 3}
-      propertyPath: m_LocalScale.y
-      value: 0.8920099
-      objectReference: {fileID: 0}
-    - target: {fileID: 1727388020353400437, guid: a445053e76baa4740a148b2a7e0c84ae, type: 3}
-      propertyPath: m_LocalScale.z
-      value: 1.1618428
-      objectReference: {fileID: 0}
-    - target: {fileID: 1727388020353400437, guid: a445053e76baa4740a148b2a7e0c84ae, type: 3}
-      propertyPath: m_LocalPosition.x
-      value: 5.2
-      objectReference: {fileID: 0}
-    - target: {fileID: 1727388020353400437, guid: a445053e76baa4740a148b2a7e0c84ae, type: 3}
-      propertyPath: m_LocalPosition.y
-      value: -7.13
-      objectReference: {fileID: 0}
-    - target: {fileID: 1727388020353400437, guid: a445053e76baa4740a148b2a7e0c84ae, type: 3}
-      propertyPath: m_LocalPosition.z
-      value: 96.2
-      objectReference: {fileID: 0}
-    - target: {fileID: 1727388020353400437, guid: a445053e76baa4740a148b2a7e0c84ae, type: 3}
-      propertyPath: m_LocalRotation.w
-      value: 0.70305556
-      objectReference: {fileID: 0}
-    - target: {fileID: 1727388020353400437, guid: a445053e76baa4740a148b2a7e0c84ae, type: 3}
-      propertyPath: m_LocalRotation.x
-      value: -0.70305556
-      objectReference: {fileID: 0}
-    - target: {fileID: 1727388020353400437, guid: a445053e76baa4740a148b2a7e0c84ae, type: 3}
-      propertyPath: m_LocalRotation.y
-      value: 0.075583875
-      objectReference: {fileID: 0}
-    - target: {fileID: 1727388020353400437, guid: a445053e76baa4740a148b2a7e0c84ae, type: 3}
-      propertyPath: m_LocalRotation.z
-      value: 0.075583875
-      objectReference: {fileID: 0}
-    - target: {fileID: 1727388020353400437, guid: a445053e76baa4740a148b2a7e0c84ae, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.x
-      value: -90
-      objectReference: {fileID: 0}
-    - target: {fileID: 1727388020353400437, guid: a445053e76baa4740a148b2a7e0c84ae, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 1727388020353400437, guid: a445053e76baa4740a148b2a7e0c84ae, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.z
-      value: 12.272
-      objectReference: {fileID: 0}
-    - target: {fileID: 6234654564258816952, guid: a445053e76baa4740a148b2a7e0c84ae, type: 3}
-      propertyPath: m_CastShadows
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 6234654564258816952, guid: a445053e76baa4740a148b2a7e0c84ae, type: 3}
-      propertyPath: m_Materials.Array.data[0]
-      value: 
-      objectReference: {fileID: 2100000, guid: 606198080c63f6248aa7119c3ad67bfc, type: 2}
-    - target: {fileID: 6234654564258816952, guid: a445053e76baa4740a148b2a7e0c84ae, type: 3}
-      propertyPath: m_Materials.Array.data[1]
-      value: 
-      objectReference: {fileID: 2100000, guid: 606198080c63f6248aa7119c3ad67bfc, type: 2}
-    - target: {fileID: 8263401684857855702, guid: a445053e76baa4740a148b2a7e0c84ae, type: 3}
-      propertyPath: m_Name
-      value: shan1 (5)
-      objectReference: {fileID: 0}
-    - target: {fileID: 8263401684857855702, guid: a445053e76baa4740a148b2a7e0c84ae, type: 3}
-      propertyPath: m_Layer
-      value: 10
-      objectReference: {fileID: 0}
-    - target: {fileID: 8263401684857855702, guid: a445053e76baa4740a148b2a7e0c84ae, type: 3}
-      propertyPath: m_TagString
-      value: dimian
-      objectReference: {fileID: 0}
-    m_RemovedComponents: []
-    m_RemovedGameObjects: []
-    m_AddedGameObjects: []
-    m_AddedComponents: []
-  m_SourcePrefab: {fileID: 100100000, guid: a445053e76baa4740a148b2a7e0c84ae, type: 3}
---- !u!4 &749609443525787432 stripped
-Transform:
-  m_CorrespondingSourceObject: {fileID: 1727388020353400437, guid: a445053e76baa4740a148b2a7e0c84ae, type: 3}
-  m_PrefabInstance: {fileID: 2134652972889276765}
-  m_PrefabAsset: {fileID: 0}
---- !u!1001 &2304810934392010970
-PrefabInstance:
-  m_ObjectHideFlags: 0
-  serializedVersion: 2
-  m_Modification:
-    serializedVersion: 3
-    m_TransformParent: {fileID: 5358946683605546402}
-    m_Modifications:
-    - target: {fileID: 1727388020353400437, guid: a445053e76baa4740a148b2a7e0c84ae, type: 3}
-      propertyPath: m_LocalScale.x
-      value: 0.6869143
-      objectReference: {fileID: 0}
-    - target: {fileID: 1727388020353400437, guid: a445053e76baa4740a148b2a7e0c84ae, type: 3}
-      propertyPath: m_LocalScale.y
-      value: 0.6869143
-      objectReference: {fileID: 0}
-    - target: {fileID: 1727388020353400437, guid: a445053e76baa4740a148b2a7e0c84ae, type: 3}
-      propertyPath: m_LocalScale.z
-      value: 0.8947058
-      objectReference: {fileID: 0}
-    - target: {fileID: 1727388020353400437, guid: a445053e76baa4740a148b2a7e0c84ae, type: 3}
-      propertyPath: m_LocalPosition.x
-      value: -8.03
-      objectReference: {fileID: 0}
-    - target: {fileID: 1727388020353400437, guid: a445053e76baa4740a148b2a7e0c84ae, type: 3}
-      propertyPath: m_LocalPosition.y
-      value: -3.72
-      objectReference: {fileID: 0}
-    - target: {fileID: 1727388020353400437, guid: a445053e76baa4740a148b2a7e0c84ae, type: 3}
-      propertyPath: m_LocalPosition.z
-      value: 53.66
-      objectReference: {fileID: 0}
-    - target: {fileID: 1727388020353400437, guid: a445053e76baa4740a148b2a7e0c84ae, type: 3}
-      propertyPath: m_LocalRotation.w
-      value: -0.59824336
-      objectReference: {fileID: 0}
-    - target: {fileID: 1727388020353400437, guid: a445053e76baa4740a148b2a7e0c84ae, type: 3}
-      propertyPath: m_LocalRotation.x
-      value: 0.59824336
-      objectReference: {fileID: 0}
-    - target: {fileID: 1727388020353400437, guid: a445053e76baa4740a148b2a7e0c84ae, type: 3}
-      propertyPath: m_LocalRotation.y
-      value: -0.37696806
-      objectReference: {fileID: 0}
-    - target: {fileID: 1727388020353400437, guid: a445053e76baa4740a148b2a7e0c84ae, type: 3}
-      propertyPath: m_LocalRotation.z
-      value: -0.37696806
-      objectReference: {fileID: 0}
-    - target: {fileID: 1727388020353400437, guid: a445053e76baa4740a148b2a7e0c84ae, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.x
-      value: -90
-      objectReference: {fileID: 0}
-    - target: {fileID: 1727388020353400437, guid: a445053e76baa4740a148b2a7e0c84ae, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 1727388020353400437, guid: a445053e76baa4740a148b2a7e0c84ae, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.z
-      value: 424.432
-      objectReference: {fileID: 0}
-    - target: {fileID: 6234654564258816952, guid: a445053e76baa4740a148b2a7e0c84ae, type: 3}
-      propertyPath: m_CastShadows
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 6234654564258816952, guid: a445053e76baa4740a148b2a7e0c84ae, type: 3}
-      propertyPath: m_Materials.Array.data[0]
-      value: 
-      objectReference: {fileID: 2100000, guid: 606198080c63f6248aa7119c3ad67bfc, type: 2}
-    - target: {fileID: 6234654564258816952, guid: a445053e76baa4740a148b2a7e0c84ae, type: 3}
-      propertyPath: m_Materials.Array.data[1]
-      value: 
-      objectReference: {fileID: 2100000, guid: 606198080c63f6248aa7119c3ad67bfc, type: 2}
-    - target: {fileID: 8263401684857855702, guid: a445053e76baa4740a148b2a7e0c84ae, type: 3}
-      propertyPath: m_Name
-      value: shan1 (2)
-      objectReference: {fileID: 0}
-    - target: {fileID: 8263401684857855702, guid: a445053e76baa4740a148b2a7e0c84ae, type: 3}
-      propertyPath: m_Layer
-      value: 10
-      objectReference: {fileID: 0}
-    - target: {fileID: 8263401684857855702, guid: a445053e76baa4740a148b2a7e0c84ae, type: 3}
-      propertyPath: m_TagString
-      value: dimian
-      objectReference: {fileID: 0}
-    m_RemovedComponents: []
-    m_RemovedGameObjects: []
-    m_AddedGameObjects: []
-    m_AddedComponents: []
-  m_SourcePrefab: {fileID: 100100000, guid: a445053e76baa4740a148b2a7e0c84ae, type: 3}
---- !u!4 &577796752425535151 stripped
-Transform:
-  m_CorrespondingSourceObject: {fileID: 1727388020353400437, guid: a445053e76baa4740a148b2a7e0c84ae, type: 3}
-  m_PrefabInstance: {fileID: 2304810934392010970}
-  m_PrefabAsset: {fileID: 0}
---- !u!1001 &4454851120747843754
-PrefabInstance:
-  m_ObjectHideFlags: 0
-  serializedVersion: 2
-  m_Modification:
-    serializedVersion: 3
-    m_TransformParent: {fileID: 5358946683605546402}
-    m_Modifications:
-    - target: {fileID: 1727388020353400437, guid: a445053e76baa4740a148b2a7e0c84ae, type: 3}
-      propertyPath: m_LocalScale.x
-      value: 0.85572696
-      objectReference: {fileID: 0}
-    - target: {fileID: 1727388020353400437, guid: a445053e76baa4740a148b2a7e0c84ae, type: 3}
-      propertyPath: m_LocalScale.y
-      value: 0.8557271
-      objectReference: {fileID: 0}
-    - target: {fileID: 1727388020353400437, guid: a445053e76baa4740a148b2a7e0c84ae, type: 3}
-      propertyPath: m_LocalScale.z
-      value: 1.1145844
-      objectReference: {fileID: 0}
-    - target: {fileID: 1727388020353400437, guid: a445053e76baa4740a148b2a7e0c84ae, type: 3}
-      propertyPath: m_LocalPosition.x
-      value: -13.7
-      objectReference: {fileID: 0}
-    - target: {fileID: 1727388020353400437, guid: a445053e76baa4740a148b2a7e0c84ae, type: 3}
-      propertyPath: m_LocalPosition.y
-      value: -7.13
-      objectReference: {fileID: 0}
-    - target: {fileID: 1727388020353400437, guid: a445053e76baa4740a148b2a7e0c84ae, type: 3}
-      propertyPath: m_LocalPosition.z
-      value: 37.7
-      objectReference: {fileID: 0}
-    - target: {fileID: 1727388020353400437, guid: a445053e76baa4740a148b2a7e0c84ae, type: 3}
-      propertyPath: m_LocalRotation.w
-      value: 0.14788894
-      objectReference: {fileID: 0}
-    - target: {fileID: 1727388020353400437, guid: a445053e76baa4740a148b2a7e0c84ae, type: 3}
-      propertyPath: m_LocalRotation.x
-      value: -0.14788894
-      objectReference: {fileID: 0}
-    - target: {fileID: 1727388020353400437, guid: a445053e76baa4740a148b2a7e0c84ae, type: 3}
-      propertyPath: m_LocalRotation.y
-      value: 0.69146866
-      objectReference: {fileID: 0}
-    - target: {fileID: 1727388020353400437, guid: a445053e76baa4740a148b2a7e0c84ae, type: 3}
-      propertyPath: m_LocalRotation.z
-      value: 0.69146866
-      objectReference: {fileID: 0}
-    - target: {fileID: 1727388020353400437, guid: a445053e76baa4740a148b2a7e0c84ae, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.x
-      value: -90
-      objectReference: {fileID: 0}
-    - target: {fileID: 1727388020353400437, guid: a445053e76baa4740a148b2a7e0c84ae, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 1727388020353400437, guid: a445053e76baa4740a148b2a7e0c84ae, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.z
-      value: 155.855
-      objectReference: {fileID: 0}
-    - target: {fileID: 6234654564258816952, guid: a445053e76baa4740a148b2a7e0c84ae, type: 3}
-      propertyPath: m_CastShadows
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 6234654564258816952, guid: a445053e76baa4740a148b2a7e0c84ae, type: 3}
-      propertyPath: m_Materials.Array.data[0]
-      value: 
-      objectReference: {fileID: 2100000, guid: 606198080c63f6248aa7119c3ad67bfc, type: 2}
-    - target: {fileID: 6234654564258816952, guid: a445053e76baa4740a148b2a7e0c84ae, type: 3}
-      propertyPath: m_Materials.Array.data[1]
-      value: 
-      objectReference: {fileID: 2100000, guid: 606198080c63f6248aa7119c3ad67bfc, type: 2}
-    - target: {fileID: 8263401684857855702, guid: a445053e76baa4740a148b2a7e0c84ae, type: 3}
-      propertyPath: m_Name
-      value: shan1 (1)
-      objectReference: {fileID: 0}
-    - target: {fileID: 8263401684857855702, guid: a445053e76baa4740a148b2a7e0c84ae, type: 3}
-      propertyPath: m_Layer
-      value: 10
-      objectReference: {fileID: 0}
-    - target: {fileID: 8263401684857855702, guid: a445053e76baa4740a148b2a7e0c84ae, type: 3}
-      propertyPath: m_TagString
-      value: dimian
-      objectReference: {fileID: 0}
-    m_RemovedComponents: []
-    m_RemovedGameObjects: []
-    m_AddedGameObjects: []
-    m_AddedComponents: []
-  m_SourcePrefab: {fileID: 100100000, guid: a445053e76baa4740a148b2a7e0c84ae, type: 3}
---- !u!4 &3038281843829960415 stripped
-Transform:
-  m_CorrespondingSourceObject: {fileID: 1727388020353400437, guid: a445053e76baa4740a148b2a7e0c84ae, type: 3}
-  m_PrefabInstance: {fileID: 4454851120747843754}
-  m_PrefabAsset: {fileID: 0}
---- !u!1001 &6061142132874065311
-PrefabInstance:
-  m_ObjectHideFlags: 0
-  serializedVersion: 2
-  m_Modification:
-    serializedVersion: 3
-    m_TransformParent: {fileID: 5358946683605546402}
-    m_Modifications:
-    - target: {fileID: 1727388020353400437, guid: a445053e76baa4740a148b2a7e0c84ae, type: 3}
-      propertyPath: m_LocalScale.x
-      value: 0.8920098
-      objectReference: {fileID: 0}
-    - target: {fileID: 1727388020353400437, guid: a445053e76baa4740a148b2a7e0c84ae, type: 3}
-      propertyPath: m_LocalScale.y
-      value: 0.8920099
-      objectReference: {fileID: 0}
-    - target: {fileID: 1727388020353400437, guid: a445053e76baa4740a148b2a7e0c84ae, type: 3}
-      propertyPath: m_LocalScale.z
-      value: 1.9684281
-      objectReference: {fileID: 0}
-    - target: {fileID: 1727388020353400437, guid: a445053e76baa4740a148b2a7e0c84ae, type: 3}
-      propertyPath: m_LocalPosition.x
-      value: 21.7
-      objectReference: {fileID: 0}
-    - target: {fileID: 1727388020353400437, guid: a445053e76baa4740a148b2a7e0c84ae, type: 3}
-      propertyPath: m_LocalPosition.y
-      value: -7.13
-      objectReference: {fileID: 0}
-    - target: {fileID: 1727388020353400437, guid: a445053e76baa4740a148b2a7e0c84ae, type: 3}
-      propertyPath: m_LocalPosition.z
-      value: 136.1
-      objectReference: {fileID: 0}
-    - target: {fileID: 1727388020353400437, guid: a445053e76baa4740a148b2a7e0c84ae, type: 3}
-      propertyPath: m_LocalRotation.w
-      value: 0.008537517
-      objectReference: {fileID: 0}
-    - target: {fileID: 1727388020353400437, guid: a445053e76baa4740a148b2a7e0c84ae, type: 3}
-      propertyPath: m_LocalRotation.x
-      value: -0.008537517
-      objectReference: {fileID: 0}
-    - target: {fileID: 1727388020353400437, guid: a445053e76baa4740a148b2a7e0c84ae, type: 3}
-      propertyPath: m_LocalRotation.y
-      value: 0.7070553
-      objectReference: {fileID: 0}
-    - target: {fileID: 1727388020353400437, guid: a445053e76baa4740a148b2a7e0c84ae, type: 3}
-      propertyPath: m_LocalRotation.z
-      value: 0.7070553
-      objectReference: {fileID: 0}
-    - target: {fileID: 1727388020353400437, guid: a445053e76baa4740a148b2a7e0c84ae, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.x
-      value: -90
-      objectReference: {fileID: 0}
-    - target: {fileID: 1727388020353400437, guid: a445053e76baa4740a148b2a7e0c84ae, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 1727388020353400437, guid: a445053e76baa4740a148b2a7e0c84ae, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.z
-      value: 178.616
-      objectReference: {fileID: 0}
-    - target: {fileID: 6234654564258816952, guid: a445053e76baa4740a148b2a7e0c84ae, type: 3}
-      propertyPath: m_CastShadows
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 6234654564258816952, guid: a445053e76baa4740a148b2a7e0c84ae, type: 3}
-      propertyPath: m_Materials.Array.data[0]
-      value: 
-      objectReference: {fileID: 2100000, guid: 606198080c63f6248aa7119c3ad67bfc, type: 2}
-    - target: {fileID: 6234654564258816952, guid: a445053e76baa4740a148b2a7e0c84ae, type: 3}
-      propertyPath: m_Materials.Array.data[1]
-      value: 
-      objectReference: {fileID: 2100000, guid: 606198080c63f6248aa7119c3ad67bfc, type: 2}
-    - target: {fileID: 8263401684857855702, guid: a445053e76baa4740a148b2a7e0c84ae, type: 3}
-      propertyPath: m_Name
-      value: shan1 (7)
-      objectReference: {fileID: 0}
-    - target: {fileID: 8263401684857855702, guid: a445053e76baa4740a148b2a7e0c84ae, type: 3}
-      propertyPath: m_Layer
-      value: 10
-      objectReference: {fileID: 0}
-    - target: {fileID: 8263401684857855702, guid: a445053e76baa4740a148b2a7e0c84ae, type: 3}
-      propertyPath: m_TagString
-      value: dimian
-      objectReference: {fileID: 0}
-    m_RemovedComponents: []
-    m_RemovedGameObjects: []
-    m_AddedGameObjects: []
-    m_AddedComponents: []
-  m_SourcePrefab: {fileID: 100100000, guid: a445053e76baa4740a148b2a7e0c84ae, type: 3}
---- !u!4 &4892434117245881322 stripped
-Transform:
-  m_CorrespondingSourceObject: {fileID: 1727388020353400437, guid: a445053e76baa4740a148b2a7e0c84ae, type: 3}
-  m_PrefabInstance: {fileID: 6061142132874065311}
-  m_PrefabAsset: {fileID: 0}
---- !u!1001 &7400822865187040459
-PrefabInstance:
-  m_ObjectHideFlags: 0
-  serializedVersion: 2
-  m_Modification:
-    serializedVersion: 3
-    m_TransformParent: {fileID: 5358946683605546402}
-    m_Modifications:
-    - target: {fileID: 1727388020353400437, guid: a445053e76baa4740a148b2a7e0c84ae, type: 3}
-      propertyPath: m_LocalScale.x
-      value: 0.4731947
-      objectReference: {fileID: 0}
-    - target: {fileID: 1727388020353400437, guid: a445053e76baa4740a148b2a7e0c84ae, type: 3}
-      propertyPath: m_LocalScale.y
-      value: 0.4731947
-      objectReference: {fileID: 0}
-    - target: {fileID: 1727388020353400437, guid: a445053e76baa4740a148b2a7e0c84ae, type: 3}
-      propertyPath: m_LocalScale.z
-      value: 0.616336
-      objectReference: {fileID: 0}
-    - target: {fileID: 1727388020353400437, guid: a445053e76baa4740a148b2a7e0c84ae, type: 3}
-      propertyPath: m_LocalPosition.x
-      value: 3.07
-      objectReference: {fileID: 0}
-    - target: {fileID: 1727388020353400437, guid: a445053e76baa4740a148b2a7e0c84ae, type: 3}
-      propertyPath: m_LocalPosition.y
-      value: -2.15
-      objectReference: {fileID: 0}
-    - target: {fileID: 1727388020353400437, guid: a445053e76baa4740a148b2a7e0c84ae, type: 3}
-      propertyPath: m_LocalPosition.z
-      value: 8.52
-      objectReference: {fileID: 0}
-    - target: {fileID: 1727388020353400437, guid: a445053e76baa4740a148b2a7e0c84ae, type: 3}
-      propertyPath: m_LocalRotation.w
-      value: -0.2933682
-      objectReference: {fileID: 0}
-    - target: {fileID: 1727388020353400437, guid: a445053e76baa4740a148b2a7e0c84ae, type: 3}
-      propertyPath: m_LocalRotation.x
-      value: 0.4862762
-      objectReference: {fileID: 0}
-    - target: {fileID: 1727388020353400437, guid: a445053e76baa4740a148b2a7e0c84ae, type: 3}
-      propertyPath: m_LocalRotation.y
-      value: 0.5867975
-      objectReference: {fileID: 0}
-    - target: {fileID: 1727388020353400437, guid: a445053e76baa4740a148b2a7e0c84ae, type: 3}
-      propertyPath: m_LocalRotation.z
-      value: 0.5771823
-      objectReference: {fileID: 0}
-    - target: {fileID: 1727388020353400437, guid: a445053e76baa4740a148b2a7e0c84ae, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.x
-      value: -105.699
-      objectReference: {fileID: 0}
-    - target: {fileID: 1727388020353400437, guid: a445053e76baa4740a148b2a7e0c84ae, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.y
-      value: -53.332
-      objectReference: {fileID: 0}
-    - target: {fileID: 1727388020353400437, guid: a445053e76baa4740a148b2a7e0c84ae, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.z
-      value: 300.961
-      objectReference: {fileID: 0}
-    - target: {fileID: 6234654564258816952, guid: a445053e76baa4740a148b2a7e0c84ae, type: 3}
-      propertyPath: m_CastShadows
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 6234654564258816952, guid: a445053e76baa4740a148b2a7e0c84ae, type: 3}
-      propertyPath: m_Materials.Array.data[0]
-      value: 
-      objectReference: {fileID: 2100000, guid: 606198080c63f6248aa7119c3ad67bfc, type: 2}
-    - target: {fileID: 6234654564258816952, guid: a445053e76baa4740a148b2a7e0c84ae, type: 3}
-      propertyPath: m_Materials.Array.data[1]
-      value: 
-      objectReference: {fileID: 2100000, guid: 606198080c63f6248aa7119c3ad67bfc, type: 2}
-    - target: {fileID: 8263401684857855702, guid: a445053e76baa4740a148b2a7e0c84ae, type: 3}
-      propertyPath: m_Name
-      value: shan1 (4)
-      objectReference: {fileID: 0}
-    - target: {fileID: 8263401684857855702, guid: a445053e76baa4740a148b2a7e0c84ae, type: 3}
-      propertyPath: m_Layer
-      value: 10
-      objectReference: {fileID: 0}
-    - target: {fileID: 8263401684857855702, guid: a445053e76baa4740a148b2a7e0c84ae, type: 3}
-      propertyPath: m_TagString
-      value: dimian
-      objectReference: {fileID: 0}
-    m_RemovedComponents: []
-    m_RemovedGameObjects: []
-    m_AddedGameObjects: []
-    m_AddedComponents: []
-  m_SourcePrefab: {fileID: 100100000, guid: a445053e76baa4740a148b2a7e0c84ae, type: 3}
---- !u!4 &8164440565147112126 stripped
-Transform:
-  m_CorrespondingSourceObject: {fileID: 1727388020353400437, guid: a445053e76baa4740a148b2a7e0c84ae, type: 3}
-  m_PrefabInstance: {fileID: 7400822865187040459}
-  m_PrefabAsset: {fileID: 0}
---- !u!1001 &8255457215345764836
-PrefabInstance:
-  m_ObjectHideFlags: 0
-  serializedVersion: 2
-  m_Modification:
-    serializedVersion: 3
-    m_TransformParent: {fileID: 5358946683605546402}
-    m_Modifications:
-    - target: {fileID: 1727388020353400437, guid: a445053e76baa4740a148b2a7e0c84ae, type: 3}
-      propertyPath: m_LocalScale.x
-      value: 0.4731947
-      objectReference: {fileID: 0}
-    - target: {fileID: 1727388020353400437, guid: a445053e76baa4740a148b2a7e0c84ae, type: 3}
-      propertyPath: m_LocalScale.y
-      value: 0.4731947
-      objectReference: {fileID: 0}
-    - target: {fileID: 1727388020353400437, guid: a445053e76baa4740a148b2a7e0c84ae, type: 3}
-      propertyPath: m_LocalScale.z
-      value: 0.616336
-      objectReference: {fileID: 0}
-    - target: {fileID: 1727388020353400437, guid: a445053e76baa4740a148b2a7e0c84ae, type: 3}
-      propertyPath: m_LocalPosition.x
-      value: -7.06
-      objectReference: {fileID: 0}
-    - target: {fileID: 1727388020353400437, guid: a445053e76baa4740a148b2a7e0c84ae, type: 3}
-      propertyPath: m_LocalPosition.y
-      value: -3.72
-      objectReference: {fileID: 0}
-    - target: {fileID: 1727388020353400437, guid: a445053e76baa4740a148b2a7e0c84ae, type: 3}
-      propertyPath: m_LocalPosition.z
-      value: 13.43
-      objectReference: {fileID: 0}
-    - target: {fileID: 1727388020353400437, guid: a445053e76baa4740a148b2a7e0c84ae, type: 3}
-      propertyPath: m_LocalRotation.w
-      value: -0.05391499
-      objectReference: {fileID: 0}
-    - target: {fileID: 1727388020353400437, guid: a445053e76baa4740a148b2a7e0c84ae, type: 3}
-      propertyPath: m_LocalRotation.x
-      value: 0.05391499
-      objectReference: {fileID: 0}
-    - target: {fileID: 1727388020353400437, guid: a445053e76baa4740a148b2a7e0c84ae, type: 3}
-      propertyPath: m_LocalRotation.y
-      value: 0.7050484
-      objectReference: {fileID: 0}
-    - target: {fileID: 1727388020353400437, guid: a445053e76baa4740a148b2a7e0c84ae, type: 3}
-      propertyPath: m_LocalRotation.z
-      value: 0.7050484
-      objectReference: {fileID: 0}
-    - target: {fileID: 1727388020353400437, guid: a445053e76baa4740a148b2a7e0c84ae, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.x
-      value: -90
-      objectReference: {fileID: 0}
-    - target: {fileID: 1727388020353400437, guid: a445053e76baa4740a148b2a7e0c84ae, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 1727388020353400437, guid: a445053e76baa4740a148b2a7e0c84ae, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.z
-      value: 188.746
-      objectReference: {fileID: 0}
-    - target: {fileID: 6234654564258816952, guid: a445053e76baa4740a148b2a7e0c84ae, type: 3}
-      propertyPath: m_CastShadows
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 6234654564258816952, guid: a445053e76baa4740a148b2a7e0c84ae, type: 3}
-      propertyPath: m_Materials.Array.data[0]
-      value: 
-      objectReference: {fileID: 2100000, guid: 606198080c63f6248aa7119c3ad67bfc, type: 2}
-    - target: {fileID: 6234654564258816952, guid: a445053e76baa4740a148b2a7e0c84ae, type: 3}
-      propertyPath: m_Materials.Array.data[1]
-      value: 
-      objectReference: {fileID: 2100000, guid: 606198080c63f6248aa7119c3ad67bfc, type: 2}
-    - target: {fileID: 8263401684857855702, guid: a445053e76baa4740a148b2a7e0c84ae, type: 3}
-      propertyPath: m_Name
-      value: shan1 (3)
-      objectReference: {fileID: 0}
-    - target: {fileID: 8263401684857855702, guid: a445053e76baa4740a148b2a7e0c84ae, type: 3}
-      propertyPath: m_Layer
-      value: 10
-      objectReference: {fileID: 0}
-    - target: {fileID: 8263401684857855702, guid: a445053e76baa4740a148b2a7e0c84ae, type: 3}
-      propertyPath: m_TagString
-      value: dimian
-      objectReference: {fileID: 0}
-    m_RemovedComponents: []
-    m_RemovedGameObjects: []
-    m_AddedGameObjects: []
-    m_AddedComponents: []
-  m_SourcePrefab: {fileID: 100100000, guid: a445053e76baa4740a148b2a7e0c84ae, type: 3}
---- !u!4 &7307561920632149905 stripped
-Transform:
-  m_CorrespondingSourceObject: {fileID: 1727388020353400437, guid: a445053e76baa4740a148b2a7e0c84ae, type: 3}
-  m_PrefabInstance: {fileID: 8255457215345764836}
-  m_PrefabAsset: {fileID: 0}
---- !u!1001 &9131834993178007480
-PrefabInstance:
-  m_ObjectHideFlags: 0
-  serializedVersion: 2
-  m_Modification:
-    serializedVersion: 3
-    m_TransformParent: {fileID: 5358946683605546402}
-    m_Modifications:
-    - target: {fileID: 1727388020353400437, guid: a445053e76baa4740a148b2a7e0c84ae, type: 3}
-      propertyPath: m_LocalScale.x
-      value: 0.7017995
-      objectReference: {fileID: 0}
-    - target: {fileID: 1727388020353400437, guid: a445053e76baa4740a148b2a7e0c84ae, type: 3}
-      propertyPath: m_LocalScale.y
-      value: 0.7017995
-      objectReference: {fileID: 0}
-    - target: {fileID: 1727388020353400437, guid: a445053e76baa4740a148b2a7e0c84ae, type: 3}
-      propertyPath: m_LocalScale.z
-      value: 0.91409373
-      objectReference: {fileID: 0}
-    - target: {fileID: 1727388020353400437, guid: a445053e76baa4740a148b2a7e0c84ae, type: 3}
-      propertyPath: m_LocalPosition.x
-      value: 5.4
-      objectReference: {fileID: 0}
-    - target: {fileID: 1727388020353400437, guid: a445053e76baa4740a148b2a7e0c84ae, type: 3}
-      propertyPath: m_LocalPosition.y
-      value: -3.72
-      objectReference: {fileID: 0}
-    - target: {fileID: 1727388020353400437, guid: a445053e76baa4740a148b2a7e0c84ae, type: 3}
-      propertyPath: m_LocalPosition.z
-      value: 22.98
-      objectReference: {fileID: 0}
-    - target: {fileID: 1727388020353400437, guid: a445053e76baa4740a148b2a7e0c84ae, type: 3}
-      propertyPath: m_LocalRotation.w
-      value: -0.56582814
-      objectReference: {fileID: 0}
-    - target: {fileID: 1727388020353400437, guid: a445053e76baa4740a148b2a7e0c84ae, type: 3}
-      propertyPath: m_LocalRotation.x
-      value: 0.56582814
-      objectReference: {fileID: 0}
-    - target: {fileID: 1727388020353400437, guid: a445053e76baa4740a148b2a7e0c84ae, type: 3}
-      propertyPath: m_LocalRotation.y
-      value: 0.4240737
-      objectReference: {fileID: 0}
-    - target: {fileID: 1727388020353400437, guid: a445053e76baa4740a148b2a7e0c84ae, type: 3}
-      propertyPath: m_LocalRotation.z
-      value: 0.4240737
-      objectReference: {fileID: 0}
-    - target: {fileID: 1727388020353400437, guid: a445053e76baa4740a148b2a7e0c84ae, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.x
-      value: -90
-      objectReference: {fileID: 0}
-    - target: {fileID: 1727388020353400437, guid: a445053e76baa4740a148b2a7e0c84ae, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 1727388020353400437, guid: a445053e76baa4740a148b2a7e0c84ae, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.z
-      value: 286.299
-      objectReference: {fileID: 0}
-    - target: {fileID: 6234654564258816952, guid: a445053e76baa4740a148b2a7e0c84ae, type: 3}
-      propertyPath: m_CastShadows
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 6234654564258816952, guid: a445053e76baa4740a148b2a7e0c84ae, type: 3}
-      propertyPath: m_Materials.Array.data[0]
-      value: 
-      objectReference: {fileID: 2100000, guid: 606198080c63f6248aa7119c3ad67bfc, type: 2}
-    - target: {fileID: 6234654564258816952, guid: a445053e76baa4740a148b2a7e0c84ae, type: 3}
-      propertyPath: m_Materials.Array.data[1]
-      value: 
-      objectReference: {fileID: 2100000, guid: 606198080c63f6248aa7119c3ad67bfc, type: 2}
-    - target: {fileID: 8263401684857855702, guid: a445053e76baa4740a148b2a7e0c84ae, type: 3}
-      propertyPath: m_Name
-      value: shan1
-      objectReference: {fileID: 0}
-    - target: {fileID: 8263401684857855702, guid: a445053e76baa4740a148b2a7e0c84ae, type: 3}
-      propertyPath: m_Layer
-      value: 10
-      objectReference: {fileID: 0}
-    - target: {fileID: 8263401684857855702, guid: a445053e76baa4740a148b2a7e0c84ae, type: 3}
-      propertyPath: m_TagString
-      value: dimian
-      objectReference: {fileID: 0}
-    m_RemovedComponents: []
-    m_RemovedGameObjects: []
-    m_AddedGameObjects: []
-    m_AddedComponents: []
-  m_SourcePrefab: {fileID: 100100000, guid: a445053e76baa4740a148b2a7e0c84ae, type: 3}
---- !u!4 &7584661881121843661 stripped
-Transform:
-  m_CorrespondingSourceObject: {fileID: 1727388020353400437, guid: a445053e76baa4740a148b2a7e0c84ae, type: 3}
-  m_PrefabInstance: {fileID: 9131834993178007480}
-  m_PrefabAsset: {fileID: 0}

+ 1 - 5
Assets/Scenes/testCombat.scene

@@ -28,7 +28,7 @@ RenderSettings:
   m_AmbientIntensity: 1
   m_AmbientMode: 0
   m_SubtractiveShadowColor: {r: 0.42, g: 0.478, b: 0.627, a: 1}
-  m_SkyboxMaterial: {fileID: 2100000, guid: 706f36e996cd6534ea0541203e7cd5a5, type: 2}
+  m_SkyboxMaterial: {fileID: 2100000, guid: 57679cbd980e464419b105fe5a24aba5, type: 2}
   m_HaloStrength: 0.5
   m_FlareStrength: 1
   m_FlareFadeSpeed: 3
@@ -6787,10 +6787,6 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: e11c76896c7c4fbfaa5c0ef5cbd1694b, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  heroPoint:
-  - {fileID: 2785026401502332786}
-  allNodeConfig:
-  - {fileID: 251908915422250917}
 --- !u!23 &7734719290679273988
 MeshRenderer:
   m_ObjectHideFlags: 0

+ 105 - 18
Assets/Scripts/GameLogic/Combat/CombatTool/CombatSenceController.cs

@@ -4,6 +4,7 @@ using Common.Utility.CombatEvent;
 using Core.Utility;
 using Fort23.Core;
 using Fort23.UTool;
+using GameLogic.Combat.CombatTool.SceneTool;
 using GameLogic.CombatScenesTool;
 using UnityEngine;
 using Random = UnityEngine.Random;
@@ -28,26 +29,37 @@ namespace GameLogic.Combat.CombatTool
 
         protected GameObjectPool ShengShiQiuTi;
 
-        private float shengShiStartSize=3;
-        private float shengShiEndSize=300;
+        private float shengShiStartSize = 3;
+        private float shengShiEndSize = 300;
         private float _shengShiAddTime;
         private bool _isUpdateShengShi;
 
+        private SceneMonoConfig SceneMonoConfig;
+
         public async CTask InitScenes()
         {
             GameObject gameObject = new GameObject("mvoeRoot");
 
             moveRoot = gameObject.transform;
             CTaskAwaitBuffer cTaskAwaitBuffer = new CTaskAwaitBuffer();
-            await GObjectPool.Instance.FetchAsync<GameObjectPool>("shan1", null, null, true, "shan1");
+
+            var task_a = AssetBundleLoadManager.Instance.LoadAssetAsyncTask<GameObject>("LevelBattle01.prefab",
+                delegate(AssetHandle assetHandle)
+                {
+                    GameObject gameObject = assetHandle.AssetObject<GameObject>();
+                    SceneMonoConfig = gameObject.GetComponent<SceneMonoConfig>();
+                });
+            cTaskAwaitBuffer.AddTask(task_a);
+
             ShengShiQiuTi =
                 await GObjectPool.Instance.FetchAsync<GameObjectPool>("ShengShiQiuTi", null, null, false,
                     "ShengShiQiuTi");
             ShengShiQiuTi.SetActive(false);
             lasetDir = Vector3.forward;
-            lasetPos = new Vector3(0, 5, 0);
+            lasetPos = new Vector3(0, 20, 0);
             await cTaskAwaitBuffer.WaitAll();
             currBesselPath = InitBesselPath(lasetPos);
+            SceneMonoConfig.Init(Camera.main.transform.parent);
         }
 
 
@@ -62,10 +74,10 @@ namespace GameLogic.Combat.CombatTool
             }
             Vector3 p = besselPath.GetValue(0.99f);
             lasetDir = (target - p).normalized;
-            GameObject gameObject = new GameObject("path");
-            gameObject.transform.position = satrtPos;
-            CombatPathMono combatPathMono = gameObject.AddComponent<CombatPathMono>();
-            combatPathMono.BesselPath = besselPath;
+            // GameObject gameObject = new GameObject("path");
+            // gameObject.transform.position = satrtPos;
+            // CombatPathMono combatPathMono = gameObject.AddComponent<CombatPathMono>();
+            // combatPathMono.BesselPath = besselPath;
             InitZhuangSHi(besselPath);
             return besselPath;
         }
@@ -83,20 +95,34 @@ namespace GameLogic.Combat.CombatTool
             }
             Vector3 p = besselPath.GetValue(0.99f);
             lasetDir = (target - p).normalized;
-            GameObject gameObject = new GameObject("path");
-            gameObject.transform.position = satrtPos;
-            CombatPathMono combatPathMono = gameObject.AddComponent<CombatPathMono>();
-            combatPathMono.BesselPath = besselPath;
+            // GameObject gameObject = new GameObject("path");
+            // gameObject.transform.position = satrtPos;
+            // CombatPathMono combatPathMono = gameObject.AddComponent<CombatPathMono>();
+            // combatPathMono.BesselPath = besselPath;
             InitZhuangSHi(besselPath);
             return besselPath;
         }
 
         private async CTask InitZhuangSHi(CombatSencePath besselPath)
         {
-            int count = Random.Range(30, 40);
+            InitRoadside(besselPath);
+            InitRoadside_1(besselPath);
+            InitButton(besselPath);
+        }
+
+        private async CTask InitRoadside(CombatSencePath besselPath)
+        {
+            SceneConfig sceneConfig = SceneMonoConfig.roadside;
+            int count = Random.Range(sceneConfig.minCount, sceneConfig.maxCount);
             for (int i = 0; i < count; i++)
             {
-                float md = Random.Range(0.1f, 0.9f);
+                SceneObjectConfig sceneObjectConfig = sceneConfig.GetSceneObjectConfig();
+                if (sceneObjectConfig == null)
+                {
+                    continue;
+                }
+
+                float md = Random.Range(0.05f, 1f);
                 Vector3 p = besselPath.GetValue(md);
                 Vector3 p2 = besselPath.GetValue(md - 0.01f);
                 Vector3 dir = (p - p2);
@@ -104,12 +130,72 @@ namespace GameLogic.Combat.CombatTool
                 cross = cross.normalized;
                 int odds = Random.Range(0, 100);
                 p += cross * Random.Range(8, 25) * (odds < 50 ? 1 : -1);
-                GameObjectPool gameObjectPool =
-                    await GObjectPool.Instance.FetchAsync<GameObjectPool>("shan1", null, poolName: "shan1");
+                GameObjectPool gameObjectPool = await sceneObjectConfig.GetNewPrefab();
+                GameObject g = gameObjectPool.own;
+                g.SetActive(true);
+                besselPath.allPool.Add(gameObjectPool);
+                float y = Random.Range(sceneObjectConfig.minY, sceneObjectConfig.maxY);
+                g.transform.position = new Vector3(p.x, y, p.z);
+                g.transform.eulerAngles = new Vector3(-90, 0, Random.Range(0, 360));
+            }
+        }
+
+        private async CTask InitRoadside_1(CombatSencePath besselPath)
+        {
+            SceneConfig sceneConfig = SceneMonoConfig.roadside_1;
+            int count = Random.Range(sceneConfig.minCount, sceneConfig.maxCount);
+            for (int i = 0; i < count; i++)
+            {
+                SceneObjectConfig sceneObjectConfig = sceneConfig.GetSceneObjectConfig();
+                if (sceneObjectConfig == null)
+                {
+                    continue;
+                }
+
+                float md = Random.Range(0.05f, 1f);
+                Vector3 p = besselPath.GetValue(md);
+                Vector3 p2 = besselPath.GetValue(md - 0.01f);
+                Vector3 dir = (p - p2);
+                Vector3 cross = Vector3.Cross(dir, Vector3.up);
+                cross = cross.normalized;
+                int odds = Random.Range(0, 100);
+                p += cross * Random.Range(25, 40) * (odds < 50 ? 1 : -1);
+                GameObjectPool gameObjectPool = await sceneObjectConfig.GetNewPrefab();
+                GameObject g = gameObjectPool.own;
+                g.SetActive(true);
+                besselPath.allPool.Add(gameObjectPool);
+                float y = Random.Range(sceneObjectConfig.minY, sceneObjectConfig.maxY);
+                g.transform.position = new Vector3(p.x, y, p.z);
+                g.transform.eulerAngles = new Vector3(-90, 0, Random.Range(0, 360));
+            }
+        }
+
+        private async CTask InitButton(CombatSencePath besselPath)
+        {
+            SceneConfig sceneConfig = SceneMonoConfig.button;
+            int count = Random.Range(sceneConfig.minCount, sceneConfig.maxCount);
+            for (int i = 0; i < count; i++)
+            {
+                SceneObjectConfig sceneObjectConfig = sceneConfig.GetSceneObjectConfig();
+                if (sceneObjectConfig == null)
+                {
+                    continue;
+                }
+
+                float md = Random.Range(0.05f, 1f);
+                Vector3 p = besselPath.GetValue(md);
+                Vector3 p2 = besselPath.GetValue(md - 0.01f);
+                Vector3 dir = (p - p2);
+                Vector3 cross = Vector3.Cross(dir, Vector3.up);
+                cross = cross.normalized;
+                // int odds = Random.Range(0, 100);
+                p += cross * Random.Range(-20, 20);
+                GameObjectPool gameObjectPool = await sceneObjectConfig.GetNewPrefab();
                 GameObject g = gameObjectPool.own;
                 g.SetActive(true);
                 besselPath.allPool.Add(gameObjectPool);
-                g.transform.position = new Vector3(p.x, 0, p.z) + new Vector3(0, Random.Range(-4, -1), 0);
+                float y = Random.Range(sceneObjectConfig.minY, sceneObjectConfig.maxY);
+                g.transform.position = new Vector3(p.x, y, p.z);
                 g.transform.eulerAngles = new Vector3(-90, 0, Random.Range(0, 360));
             }
         }
@@ -192,7 +278,7 @@ namespace GameLogic.Combat.CombatTool
         public void StartPayShengShi(Transform root)
         {
             ShengShiQiuTi.own.transform.SetParent(root);
-            ShengShiQiuTi.own.transform.localPosition=Vector3.zero;
+            ShengShiQiuTi.own.transform.localPosition = Vector3.zero;
             ShengShiQiuTi.SetActive(true);
             _isUpdateShengShi = true;
             ShengShiQiuTi.own.transform.localScale = Vector3.one * shengShiStartSize;
@@ -201,6 +287,7 @@ namespace GameLogic.Combat.CombatTool
 
         public void Update(float t)
         {
+            SceneMonoConfig?.Update();
             if (_isUpdateShengShi)
             {
                 _shengShiAddTime += t * 1f;

+ 3 - 0
Assets/Scripts/GameLogic/Combat/CombatTool/SceneTool.meta

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: c10f3b1977b845c2b7a0612703fd14a3
+timeCreated: 1745217355

+ 40 - 0
Assets/Scripts/GameLogic/Combat/CombatTool/SceneTool/SceneConfig.cs

@@ -0,0 +1,40 @@
+using System;
+
+namespace GameLogic.Combat.CombatTool.SceneTool
+{
+    [System.Serializable]
+    public class SceneConfig
+    {
+        public float dis=0.1f;
+        public int minCount;
+        public int maxCount;
+        public SceneObjectConfig[] SceneObjectConfigs;
+
+        private int odds;
+
+        public void Init()
+        {
+            for (int i = 0; i < SceneObjectConfigs.Length; i++)
+            {
+                odds += SceneObjectConfigs[i].odds;
+            }
+        }
+
+        public SceneObjectConfig GetSceneObjectConfig()
+        {
+            int currOdds = CombatCalculateTool.Instance.GetOdd(0, odds);
+            int currAllOdds = 0;
+            for (int i = 0; i < SceneObjectConfigs.Length; i++)
+            {
+                SceneObjectConfig sceneObjectConfig = SceneObjectConfigs[i];
+                currAllOdds += sceneObjectConfig.odds;
+                if (currAllOdds >= currOdds)
+                {
+                    return sceneObjectConfig;
+                }
+            }
+
+            return null;
+        }
+    }
+}

+ 3 - 0
Assets/Scripts/GameLogic/Combat/CombatTool/SceneTool/SceneConfig.cs.meta

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 390f625869964616902eb6b3682d5996
+timeCreated: 1745217390

+ 29 - 0
Assets/Scripts/GameLogic/Combat/CombatTool/SceneTool/SceneMonoConfig.cs

@@ -0,0 +1,29 @@
+using UnityEngine;
+
+namespace GameLogic.Combat.CombatTool.SceneTool
+{
+    public class SceneMonoConfig : MonoBehaviour
+    {
+        public string dec;
+        public SceneConfig roadside;
+        public SceneConfig roadside_1;
+        public SceneConfig button;
+
+        public GameObject skyObejct;
+
+        private Transform root;
+
+        public void Init(Transform root)
+        {
+            this.root = root;
+            roadside.Init();
+            roadside_1.Init();
+            button.Init();
+        }
+
+        public void Update()
+        {
+            skyObejct.transform.position = new Vector3(root.position.x, 0, root.position.z);
+        }
+    }
+}

+ 3 - 0
Assets/Scripts/GameLogic/Combat/CombatTool/SceneTool/SceneMonoConfig.cs.meta

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 9970cf7521114b5ebfee32908aec5603
+timeCreated: 1745217379

+ 21 - 0
Assets/Scripts/GameLogic/Combat/CombatTool/SceneTool/SceneObjectConfig.cs

@@ -0,0 +1,21 @@
+using Fort23.Core;
+using Fort23.UTool;
+using UnityEngine;
+
+namespace GameLogic.Combat.CombatTool.SceneTool
+{
+    [System.Serializable]
+    public class SceneObjectConfig
+    {
+        public int odds;
+        public float minY;
+        public float maxY;
+        public GameObject prefab;
+
+        public async CTask<GameObjectPool> GetNewPrefab()
+        {
+            GameObjectPool gameObjectPool = GObjectPool.Instance.Fetch<GameObjectPool>(prefab.name, prefab);
+            return gameObjectPool;
+        }
+    }
+}

+ 3 - 0
Assets/Scripts/GameLogic/Combat/CombatTool/SceneTool/SceneObjectConfig.cs.meta

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 9899370fe4244113ae1101dcc29e8097
+timeCreated: 1745217412

+ 2 - 2
Assets/Scripts/GameLogic/Combat/CombatType/TestCombatType.cs

@@ -96,9 +96,9 @@ namespace GameLogic.Combat.CombatType
                 cTaskAwaitBuffer.AddTask(heroEntity.Init(new CombatHeroAi(), combatHeroInfo, pos,
                     delegate(CombatHeroEntity entity)
                     {
-                        entity.CurrCombatHeroInfo.hp = (EncryptionLong)(2000);
+                        entity.CurrCombatHeroInfo.hp = (EncryptionLong)(200);
 
-                        entity.MaxCombatHeroInfo.hp = (EncryptionLong)(2000);
+                        entity.MaxCombatHeroInfo.hp = (EncryptionLong)(200);
                         combatController.CombatHeroController.AddHero(entity);
                     }));
             }

+ 0 - 10
Assets/Scripts/GameLogic/CombatScenesTool/CombatScenesConfig.cs

@@ -1,10 +0,0 @@
-using UnityEngine;
-
-namespace GameLogic.CombatScenesTool
-{
-    public class CombatScenesConfig : MonoBehaviour
-    {
-        public Transform[] heroPoint;
-        public CombatScenesNodeConfig[] allNodeConfig;
-    }
-}

+ 0 - 3
Assets/Scripts/GameLogic/CombatScenesTool/CombatScenesConfig.cs.meta

@@ -1,3 +0,0 @@
-fileFormatVersion: 2
-guid: e11c76896c7c4fbfaa5c0ef5cbd1694b
-timeCreated: 1731314019

La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 0 - 0
Assets/StreamingAssets/assetConfig.txt


+ 8 - 8
UserSettings/EditorUserSettings.asset

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

La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 225 - 6620
UserSettings/Layouts/default-2022.dwlt


Algunos archivos no se mostraron porque demasiados archivos cambiaron en este cambio