Browse Source

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

李桃 23 hours ago
parent
commit
3ef512ed87

+ 120 - 0
Assets/Art/cs3.scene

@@ -146343,6 +146343,63 @@ ParticleSystem:
         m_PostInfinity: 2
         m_RotationOrder: 4
     vectorLabel1_3: W
+--- !u!1001 &1683718286
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    serializedVersion: 3
+    m_TransformParent: {fileID: 0}
+    m_Modifications:
+    - target: {fileID: 5696247245283382692, guid: 8af965d3c361bfc4c9fdcd7b85c19600, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: -22.8
+      objectReference: {fileID: 0}
+    - target: {fileID: 5696247245283382692, guid: 8af965d3c361bfc4c9fdcd7b85c19600, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: -3
+      objectReference: {fileID: 0}
+    - target: {fileID: 5696247245283382692, guid: 8af965d3c361bfc4c9fdcd7b85c19600, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 44.35
+      objectReference: {fileID: 0}
+    - target: {fileID: 5696247245283382692, guid: 8af965d3c361bfc4c9fdcd7b85c19600, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: -0.09862751
+      objectReference: {fileID: 0}
+    - target: {fileID: 5696247245283382692, guid: 8af965d3c361bfc4c9fdcd7b85c19600, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: 0.098627575
+      objectReference: {fileID: 0}
+    - target: {fileID: 5696247245283382692, guid: 8af965d3c361bfc4c9fdcd7b85c19600, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: -0.7001949
+      objectReference: {fileID: 0}
+    - target: {fileID: 5696247245283382692, guid: 8af965d3c361bfc4c9fdcd7b85c19600, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: -0.70019454
+      objectReference: {fileID: 0}
+    - target: {fileID: 5696247245283382692, guid: 8af965d3c361bfc4c9fdcd7b85c19600, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: -90
+      objectReference: {fileID: 0}
+    - target: {fileID: 5696247245283382692, guid: 8af965d3c361bfc4c9fdcd7b85c19600, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5696247245283382692, guid: 8af965d3c361bfc4c9fdcd7b85c19600, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: -196.036
+      objectReference: {fileID: 0}
+    - target: {fileID: 7123144361424570747, guid: 8af965d3c361bfc4c9fdcd7b85c19600, type: 3}
+      propertyPath: m_Name
+      value: shan02
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+    m_RemovedGameObjects: []
+    m_AddedGameObjects: []
+    m_AddedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: 8af965d3c361bfc4c9fdcd7b85c19600, type: 3}
 --- !u!1 &1686141424
 GameObject:
   m_ObjectHideFlags: 0
@@ -256705,6 +256762,10 @@ PrefabInstance:
       propertyPath: m_Name
       value: cj01
       objectReference: {fileID: 0}
+    - target: {fileID: 8929588464290711568, guid: 600addf310c15f74da80c081c179e5c2, type: 3}
+      propertyPath: m_IsActive
+      value: 0
+      objectReference: {fileID: 0}
     m_RemovedComponents: []
     m_RemovedGameObjects: []
     m_AddedGameObjects:
@@ -303954,6 +304015,63 @@ GameObject:
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
+--- !u!1001 &8418998920782492212
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    serializedVersion: 3
+    m_TransformParent: {fileID: 0}
+    m_Modifications:
+    - target: {fileID: 2586944165049089298, guid: dfc9c6d000d7eff4fb00d1ab747832f3, type: 3}
+      propertyPath: m_Name
+      value: LevelBattle01
+      objectReference: {fileID: 0}
+    - target: {fileID: 5603251483434550935, guid: dfc9c6d000d7eff4fb00d1ab747832f3, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5603251483434550935, guid: dfc9c6d000d7eff4fb00d1ab747832f3, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5603251483434550935, guid: dfc9c6d000d7eff4fb00d1ab747832f3, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5603251483434550935, guid: dfc9c6d000d7eff4fb00d1ab747832f3, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 5603251483434550935, guid: dfc9c6d000d7eff4fb00d1ab747832f3, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5603251483434550935, guid: dfc9c6d000d7eff4fb00d1ab747832f3, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5603251483434550935, guid: dfc9c6d000d7eff4fb00d1ab747832f3, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5603251483434550935, guid: dfc9c6d000d7eff4fb00d1ab747832f3, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5603251483434550935, guid: dfc9c6d000d7eff4fb00d1ab747832f3, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5603251483434550935, guid: dfc9c6d000d7eff4fb00d1ab747832f3, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+    m_RemovedGameObjects: []
+    m_AddedGameObjects: []
+    m_AddedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: dfc9c6d000d7eff4fb00d1ab747832f3, type: 3}
 --- !u!4 &8447732455267732671
 Transform:
   m_ObjectHideFlags: 0
@@ -310031,3 +310149,5 @@ SceneRoots:
   - {fileID: 1707834042}
   - {fileID: 4499317816330835408}
   - {fileID: 1932413942}
+  - {fileID: 8418998920782492212}
+  - {fileID: 1683718286}

+ 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/CombatScenes/NavMeshTarget.prefab.meta → Assets/Res/CombatScenes/LevelBattle01.prefab.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: XigevC3+Uy1mNc3J2WNkZ41Cci+rL8ZxpUZgUDz+b3I5SutashzIYQ3Z6wzI
+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}

+ 0 - 7
Assets/Res/LevelSecne/LevelBattle1.prefab.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: DC8d5H7+AHmQ1aPd+Wn9LLQGTA/eJqCty7h3LQs4tURoofY/cUKA89o=
-PrefabImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

+ 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

File diff suppressed because it is too large
+ 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

Some files were not shown because too many files changed in this diff