diff --git a/Assets/Art/FengLei/PaoTai/DaQiao/shot_14053.prefab b/Assets/Art/FengLei/PaoTai/DaQiao/shot_14053.prefab
index 02f07461a..06b5a295d 100644
--- a/Assets/Art/FengLei/PaoTai/DaQiao/shot_14053.prefab
+++ b/Assets/Art/FengLei/PaoTai/DaQiao/shot_14053.prefab
@@ -11,7 +11,7 @@ GameObject:
   - component: {fileID: 5067111040077426859}
   - component: {fileID: 6984580494607850783}
   - component: {fileID: 9175065689831609803}
-  m_Layer: 13
+  m_Layer: 7
   m_Name: wenli2
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -2477,7 +2477,7 @@ GameObject:
   - component: {fileID: 8783985780311842025}
   - component: {fileID: 4289642803521558664}
   - component: {fileID: 3745377979439621487}
-  m_Layer: 13
+  m_Layer: 7
   m_Name: tuowei
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -4902,7 +4902,7 @@ GameObject:
   - component: {fileID: 4243485804879166908}
   - component: {fileID: 8724151399334629916}
   - component: {fileID: 128775343710444582}
-  m_Layer: 13
+  m_Layer: 7
   m_Name: lizi
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -7304,7 +7304,7 @@ GameObject:
   m_Component:
   - component: {fileID: 5862542161611433049}
   - component: {fileID: 846794090307067499}
-  m_Layer: 13
+  m_Layer: 7
   m_Name: trail (1)
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -7450,7 +7450,7 @@ GameObject:
   - component: {fileID: 8527155337218065933}
   - component: {fileID: 7219108651033490983}
   - component: {fileID: 1228546485836449095}
-  m_Layer: 13
+  m_Layer: 7
   m_Name: guangban
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -9842,7 +9842,7 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 3606912992344821805}
-  m_Layer: 0
+  m_Layer: 7
   m_Name: Collision0
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -9873,7 +9873,7 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 1924189493632076763}
-  m_Layer: 13
+  m_Layer: 7
   m_Name: equipment_game_14053_1_bullet
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -9905,7 +9905,7 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 6038167764945230016}
-  m_Layer: 13
+  m_Layer: 7
   m_Name: shotHead
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -9936,7 +9936,7 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 5435350055757704009}
-  m_Layer: 0
+  m_Layer: 7
   m_Name: Collision3
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -9967,7 +9967,7 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 7922897915262545877}
-  m_Layer: 13
+  m_Layer: 7
   m_Name: Collsion1
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -10000,7 +10000,7 @@ GameObject:
   - component: {fileID: 235269132820033501}
   - component: {fileID: 5386808667041998820}
   - component: {fileID: 3248997498735506618}
-  m_Layer: 13
+  m_Layer: 7
   m_Name: huoxing
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -12402,7 +12402,7 @@ GameObject:
   m_Component:
   - component: {fileID: 9183502147778340404}
   - component: {fileID: 318975702626264991}
-  m_Layer: 13
+  m_Layer: 7
   m_Name: root
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -12462,7 +12462,7 @@ GameObject:
   - component: {fileID: 1309242839407879471}
   - component: {fileID: 5003166057483876462}
   - component: {fileID: 3501208051810715916}
-  m_Layer: 13
+  m_Layer: 7
   m_Name: wenli2 (2)
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -14928,7 +14928,7 @@ GameObject:
   - component: {fileID: 6167805704302457257}
   - component: {fileID: 5783802672086018482}
   - component: {fileID: 9096966308732060415}
-  m_Layer: 13
+  m_Layer: 7
   m_Name: line
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -17392,7 +17392,7 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 2876246328954606498}
-  m_Layer: 0
+  m_Layer: 7
   m_Name: Collision6
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -17425,7 +17425,7 @@ GameObject:
   - component: {fileID: 5356119262114382815}
   - component: {fileID: 3781004862243367347}
   - component: {fileID: 5810277249192352751}
-  m_Layer: 13
+  m_Layer: 7
   m_Name: zhuti
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -19890,7 +19890,7 @@ GameObject:
   m_Component:
   - component: {fileID: 46729169787803908}
   - component: {fileID: 1598812023711443560}
-  m_Layer: 13
+  m_Layer: 7
   m_Name: root
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -19953,7 +19953,7 @@ GameObject:
   - component: {fileID: 2318207829449049138}
   - component: {fileID: 6125644678780007741}
   - component: {fileID: 2686676295035358164}
-  m_Layer: 13
+  m_Layer: 7
   m_Name: line_lizi (6)
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -22256,7 +22256,7 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 7527447458778315823}
-  m_Layer: 0
+  m_Layer: 7
   m_Name: Head
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -22287,7 +22287,7 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 6669259808303334500}
-  m_Layer: 13
+  m_Layer: 7
   m_Name: root
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -22324,7 +22324,7 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 7891777394643965130}
-  m_Layer: 0
+  m_Layer: 7
   m_Name: Collision2
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -22355,7 +22355,7 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 8345840111806410653}
-  m_Layer: 13
+  m_Layer: 7
   m_Name: shot
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -22389,7 +22389,7 @@ GameObject:
   - component: {fileID: 7168414508427937568}
   - component: {fileID: 4100759699599971333}
   - component: {fileID: 7691715169762693057}
-  m_Layer: 13
+  m_Layer: 7
   m_Name: zhuti (1)
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -24853,7 +24853,7 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 7334672169278934844}
-  m_Layer: 0
+  m_Layer: 7
   m_Name: Head
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -24884,7 +24884,7 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 3480275275798262000}
-  m_Layer: 0
+  m_Layer: 7
   m_Name: Collision1
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -24915,7 +24915,7 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 3329274481448050476}
-  m_Layer: 0
+  m_Layer: 7
   m_Name: Collision7
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -24948,7 +24948,7 @@ GameObject:
   - component: {fileID: 2840235522078824786}
   - component: {fileID: 8730766783611216864}
   - component: {fileID: 2498865843439018736}
-  m_Layer: 13
+  m_Layer: 7
   m_Name: lh_zhuti
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -27317,9 +27317,12 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 2963902139273695761}
-  m_Layer: 13
+  - component: {fileID: -8505999011761150105}
+  - component: {fileID: 4250108484294673949}
+  - component: {fileID: 667733005085343590}
+  m_Layer: 7
   m_Name: shot_14053
-  m_TagString: Untagged
+  m_TagString: Bullet
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
@@ -27347,6 +27350,105 @@ Transform:
   - {fileID: 1924189493632076763}
   m_Father: {fileID: 0}
   m_LocalEulerAnglesHint: {x: 0, y: -0, z: -0}
+--- !u!114 &-8505999011761150105
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6300000819753586713}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 59323a063846feb4cb2ab243e7887554, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  userid: 
+  moveSpeed: 5
+  desTime: 10
+  playerID: 
+  effectPrefab: {fileID: 6190839534623811461, guid: d605939827de9f44fa1f923369f8dee9,
+    type: 3}
+  diePrefab: {fileID: 6304718870697136037, guid: 81d9913b840dd1e4d9801e06ed16d14e,
+    type: 3}
+  isTriggerFirst: 1
+  targetTra: {fileID: 0}
+  bulletID: 
+  maxTurnSpeed: 15
+  minTurnSpeed: 2
+  distanceForMaxTurn: 1
+  sortOrder: 100
+--- !u!61 &4250108484294673949
+BoxCollider2D:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6300000819753586713}
+  m_Enabled: 1
+  m_Density: 1
+  m_Material: {fileID: 0}
+  m_IncludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_ExcludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_LayerOverridePriority: 0
+  m_ForceSendLayers:
+    serializedVersion: 2
+    m_Bits: 4294967295
+  m_ForceReceiveLayers:
+    serializedVersion: 2
+    m_Bits: 4294967295
+  m_ContactCaptureLayers:
+    serializedVersion: 2
+    m_Bits: 4294967295
+  m_CallbackLayers:
+    serializedVersion: 2
+    m_Bits: 4294967295
+  m_IsTrigger: 1
+  m_UsedByEffector: 0
+  m_UsedByComposite: 0
+  m_Offset: {x: -0.02321446, y: 0.016581804}
+  m_SpriteTilingProperty:
+    border: {x: 0, y: 0, z: 0, w: 0}
+    pivot: {x: 0, y: 0}
+    oldSize: {x: 0, y: 0}
+    newSize: {x: 0, y: 0}
+    adaptiveTilingThreshold: 0
+    drawMode: 0
+    adaptiveTiling: 0
+  m_AutoTiling: 0
+  serializedVersion: 2
+  m_Size: {x: 1.2719412, y: 1.0729599}
+  m_EdgeRadius: 0
+--- !u!50 &667733005085343590
+Rigidbody2D:
+  serializedVersion: 4
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6300000819753586713}
+  m_BodyType: 1
+  m_Simulated: 1
+  m_UseFullKinematicContacts: 0
+  m_UseAutoMass: 0
+  m_Mass: 1
+  m_LinearDrag: 0
+  m_AngularDrag: 0.05
+  m_GravityScale: 1
+  m_Material: {fileID: 0}
+  m_IncludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_ExcludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_Interpolate: 0
+  m_SleepingMode: 1
+  m_CollisionDetection: 0
+  m_Constraints: 0
 --- !u!1 &6735039960857871785
 GameObject:
   m_ObjectHideFlags: 0
@@ -27356,7 +27458,7 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 2644135767371262054}
-  m_Layer: 13
+  m_Layer: 7
   m_Name: root
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -27393,7 +27495,7 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 5069169348652563702}
-  m_Layer: 13
+  m_Layer: 7
   m_Name: Collsion3
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -27424,7 +27526,7 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 3689811969688865415}
-  m_Layer: 0
+  m_Layer: 7
   m_Name: Collision3
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -27457,7 +27559,7 @@ GameObject:
   - component: {fileID: 2674900420036955920}
   - component: {fileID: 4224062356732163883}
   - component: {fileID: 460399179341366606}
-  m_Layer: 13
+  m_Layer: 7
   m_Name: glow_di
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -29921,7 +30023,7 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 3207517018748596351}
-  m_Layer: 0
+  m_Layer: 7
   m_Name: Collision2
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -29954,7 +30056,7 @@ GameObject:
   - component: {fileID: 2955697186414840142}
   - component: {fileID: 2043092749001483019}
   - component: {fileID: 5158811004227865667}
-  m_Layer: 13
+  m_Layer: 7
   m_Name: glow
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -32377,7 +32479,7 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 4695164594997008933}
-  m_Layer: 13
+  m_Layer: 7
   m_Name: Collsion2
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -32408,7 +32510,7 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 2636883070939650853}
-  m_Layer: 13
+  m_Layer: 7
   m_Name: equipment_game_14052_1_bullet
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -32442,7 +32544,7 @@ GameObject:
   - component: {fileID: 8694823566436119495}
   - component: {fileID: 7160657846046931773}
   - component: {fileID: 7962691464769187630}
-  m_Layer: 13
+  m_Layer: 7
   m_Name: wenli2 (1)
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -34906,7 +35008,7 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 1953550503524684797}
-  m_Layer: 13
+  m_Layer: 7
   m_Name: Collsion0
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -34939,7 +35041,7 @@ GameObject:
   - component: {fileID: 8094840294500744780}
   - component: {fileID: 8807621142268343372}
   - component: {fileID: 6394766179966803696}
-  m_Layer: 13
+  m_Layer: 7
   m_Name: shot1
   m_TagString: Untagged
   m_Icon: {fileID: 0}
diff --git a/Assets/Art/FengLei/ResLY/AnimatorController/14053_1_Animator.controller b/Assets/Art/FengLei/ResLY/AnimatorController/14053_1_Animator.controller
index 4dc8313b7..3cff95449 100644
--- a/Assets/Art/FengLei/ResLY/AnimatorController/14053_1_Animator.controller
+++ b/Assets/Art/FengLei/ResLY/AnimatorController/14053_1_Animator.controller
@@ -2,12 +2,12 @@
 %TAG !u! tag:unity3d.com,2011:
 --- !u!91 &9100000
 AnimatorController:
-  serializedVersion: 5
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_Name: 14053_1_Animator
+  serializedVersion: 5
   m_AnimatorParameters:
   - m_Name: EnterIndex
     m_Type: 3
@@ -64,88 +64,13 @@ AnimatorController:
     m_IKPass: 0
     m_SyncedLayerAffectsTiming: 0
     m_Controller: {fileID: 9100000}
---- !u!1107 &1107873374580099368
-AnimatorStateMachine:
-  serializedVersion: 6
-  m_ObjectHideFlags: 1
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_Name: Base Layer
-  m_ChildStates: []
-  m_ChildStateMachines:
-  - m_StateMachine: {fileID: 1107058171320156754}
-    m_Position: {x: 0, y: 0, z: 0}
-  - m_StateMachine: {fileID: 1107386386589132418}
-    m_Position: {x: 250, y: 0, z: 0}
-  m_AnyStateTransitions: []
-  m_EntryTransitions: []
-  m_StateMachineTransitions:
-  - first: {fileID: 1107386386589132418}
-    second:
-    - {fileID: 1109294262637612309}
-  m_StateMachineBehaviours: []
-  m_AnyStatePosition: {x: 0, y: -100, z: 0}
-  m_EntryPosition: {x: 250, y: -100, z: 0}
-  m_ExitPosition: {x: 500, y: -100, z: 0}
-  m_ParentStateMachinePosition: {x: 0, y: -200, z: 0}
-  m_DefaultState: {fileID: 1102576693374580535}
---- !u!1107 &1107058171320156754
-AnimatorStateMachine:
-  serializedVersion: 6
-  m_ObjectHideFlags: 1
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_Name: Idle
-  m_ChildStates:
-  - m_State: {fileID: 1102576693374580535}
-    m_Position: {x: 0, y: 0, z: 0}
-  m_ChildStateMachines: []
-  m_AnyStateTransitions: []
-  m_EntryTransitions: []
-  m_StateMachineTransitions: {}
-  m_StateMachineBehaviours: []
-  m_AnyStatePosition: {x: 0, y: -100, z: 0}
-  m_EntryPosition: {x: 250, y: -100, z: 0}
-  m_ExitPosition: {x: 500, y: -100, z: 0}
-  m_ParentStateMachinePosition: {x: 0, y: -200, z: 0}
-  m_DefaultState: {fileID: 1102576693374580535}
---- !u!1102 &1102576693374580535
-AnimatorState:
-  serializedVersion: 6
-  m_ObjectHideFlags: 1
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_Name: Idle0
-  m_Speed: 1
-  m_CycleOffset: 0
-  m_Transitions:
-  - {fileID: 1101021321593431017}
-  m_StateMachineBehaviours: []
-  m_Position: {x: 0, y: 0, z: 0}
-  m_IKOnFeet: 0
-  m_WriteDefaultValues: 1
-  m_Mirror: 0
-  m_SpeedParameterActive: 0
-  m_MirrorParameterActive: 0
-  m_CycleOffsetParameterActive: 0
-  m_TimeParameterActive: 0
-  m_Motion: {fileID: 7400000, guid: c536a856270d2cb46a2678876203c774, type: 2}
-  m_Tag: Idle
-  m_SpeedParameter:
-  m_MirrorParameter:
-  m_CycleOffsetParameter:
-  m_TimeParameter:
 --- !u!1101 &1101021321593431017
 AnimatorStateTransition:
-  serializedVersion: 3
   m_ObjectHideFlags: 1
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_Name:
+  m_Name: 
   m_Conditions:
   - m_ConditionMode: 1
     m_ConditionEvent: PlayFire
@@ -155,6 +80,7 @@ AnimatorStateTransition:
   m_Solo: 0
   m_Mute: 0
   m_IsExit: 0
+  serializedVersion: 3
   m_TransitionDuration: 0.1
   m_TransitionOffset: 0
   m_ExitTime: 0.9
@@ -163,223 +89,13 @@ AnimatorStateTransition:
   m_InterruptionSource: 0
   m_OrderedInterruption: 1
   m_CanTransitionToSelf: 1
---- !u!1107 &1107386386589132418
-AnimatorStateMachine:
-  serializedVersion: 6
-  m_ObjectHideFlags: 1
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_Name: Fire
-  m_ChildStates: []
-  m_ChildStateMachines:
-  - m_StateMachine: {fileID: 1107643901766864274}
-    m_Position: {x: 0, y: 0, z: 0}
-  - m_StateMachine: {fileID: 1107141658647961963}
-    m_Position: {x: 250, y: 0, z: 0}
-  m_AnyStateTransitions: []
-  m_EntryTransitions:
-  - {fileID: 1109308842003191360}
-  m_StateMachineTransitions:
-  - first: {fileID: 1107643901766864274}
-    second:
-    - {fileID: 1109089921127702195}
-    - {fileID: 1109485448914599082}
-  - first: {fileID: 1107141658647961963}
-    second:
-    - {fileID: 1109987611724976417}
-    - {fileID: 1109621476171100876}
-  m_StateMachineBehaviours: []
-  m_AnyStatePosition: {x: 0, y: -100, z: 0}
-  m_EntryPosition: {x: 250, y: -100, z: 0}
-  m_ExitPosition: {x: 500, y: -100, z: 0}
-  m_ParentStateMachinePosition: {x: 0, y: -200, z: 0}
-  m_DefaultState: {fileID: 1102297467249740649}
---- !u!1107 &1107643901766864274
-AnimatorStateMachine:
-  serializedVersion: 6
-  m_ObjectHideFlags: 1
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_Name: fire0
-  m_ChildStates:
-  - m_State: {fileID: 1102297467249740649}
-    m_Position: {x: 0, y: 0, z: 0}
-  m_ChildStateMachines: []
-  m_AnyStateTransitions: []
-  m_EntryTransitions: []
-  m_StateMachineTransitions: {}
-  m_StateMachineBehaviours: []
-  m_AnyStatePosition: {x: 0, y: -100, z: 0}
-  m_EntryPosition: {x: 250, y: -100, z: 0}
-  m_ExitPosition: {x: 500, y: -100, z: 0}
-  m_ParentStateMachinePosition: {x: 0, y: -200, z: 0}
-  m_DefaultState: {fileID: 1102297467249740649}
---- !u!1102 &1102297467249740649
-AnimatorState:
-  serializedVersion: 6
-  m_ObjectHideFlags: 1
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_Name: fire_0
-  m_Speed: 1
-  m_CycleOffset: 0
-  m_Transitions:
-  - {fileID: 1101511246989886340}
-  - {fileID: 1101829879740029450}
-  m_StateMachineBehaviours: []
-  m_Position: {x: 0, y: 0, z: 0}
-  m_IKOnFeet: 0
-  m_WriteDefaultValues: 1
-  m_Mirror: 0
-  m_SpeedParameterActive: 0
-  m_MirrorParameterActive: 0
-  m_CycleOffsetParameterActive: 0
-  m_TimeParameterActive: 0
-  m_Motion: {fileID: 7400000, guid: be75a1451b44aae4dbe892b9396dd77f, type: 2}
-  m_Tag:
-  m_SpeedParameter:
-  m_MirrorParameter:
-  m_CycleOffsetParameter:
-  m_TimeParameter:
---- !u!1101 &1101511246989886340
+--- !u!1101 &1101245751037863158
 AnimatorStateTransition:
-  serializedVersion: 3
   m_ObjectHideFlags: 1
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_Name:
-  m_Conditions:
-  - m_ConditionMode: 2
-    m_ConditionEvent: PlayFire
-    m_EventTreshold: 0
-  m_DstStateMachine: {fileID: 0}
-  m_DstState: {fileID: 0}
-  m_Solo: 0
-  m_Mute: 0
-  m_IsExit: 1
-  m_TransitionDuration: 0.1
-  m_TransitionOffset: 0
-  m_ExitTime: 0.9
-  m_HasExitTime: 1
-  m_HasFixedDuration: 1
-  m_InterruptionSource: 0
-  m_OrderedInterruption: 1
-  m_CanTransitionToSelf: 1
---- !u!1101 &1101829879740029450
-AnimatorStateTransition:
-  serializedVersion: 3
-  m_ObjectHideFlags: 1
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_Name:
-  m_Conditions:
-  - m_ConditionMode: 7
-    m_ConditionEvent: FireIndex
-    m_EventTreshold: 0
-  m_DstStateMachine: {fileID: 0}
-  m_DstState: {fileID: 0}
-  m_Solo: 0
-  m_Mute: 0
-  m_IsExit: 1
-  m_TransitionDuration: 0.1
-  m_TransitionOffset: 0
-  m_ExitTime: 0.9
-  m_HasExitTime: 0
-  m_HasFixedDuration: 1
-  m_InterruptionSource: 0
-  m_OrderedInterruption: 1
-  m_CanTransitionToSelf: 1
---- !u!1107 &1107141658647961963
-AnimatorStateMachine:
-  serializedVersion: 6
-  m_ObjectHideFlags: 1
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_Name: fire1
-  m_ChildStates:
-  - m_State: {fileID: 1102872234582746100}
-    m_Position: {x: 0, y: 0, z: 0}
-  - m_State: {fileID: 1102215423201716925}
-    m_Position: {x: 250, y: 0, z: 0}
-  - m_State: {fileID: 1102586851107390720}
-    m_Position: {x: 0, y: 100, z: 0}
-  m_ChildStateMachines: []
-  m_AnyStateTransitions: []
-  m_EntryTransitions: []
-  m_StateMachineTransitions: {}
-  m_StateMachineBehaviours: []
-  m_AnyStatePosition: {x: 0, y: -100, z: 0}
-  m_EntryPosition: {x: 250, y: -100, z: 0}
-  m_ExitPosition: {x: 500, y: -100, z: 0}
-  m_ParentStateMachinePosition: {x: 0, y: -200, z: 0}
-  m_DefaultState: {fileID: 1102215423201716925}
---- !u!1102 &1102872234582746100
-AnimatorState:
-  serializedVersion: 6
-  m_ObjectHideFlags: 1
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_Name: fire_1
-  m_Speed: 1
-  m_CycleOffset: 0
-  m_Transitions:
-  - {fileID: 1101956084455425907}
-  - {fileID: 1101553156517545971}
-  m_StateMachineBehaviours: []
-  m_Position: {x: 0, y: 0, z: 0}
-  m_IKOnFeet: 0
-  m_WriteDefaultValues: 1
-  m_Mirror: 0
-  m_SpeedParameterActive: 0
-  m_MirrorParameterActive: 0
-  m_CycleOffsetParameterActive: 0
-  m_TimeParameterActive: 0
-  m_Motion: {fileID: 7400000, guid: b918c3e41a32cde4a91630a56a316977, type: 2}
-  m_Tag:
-  m_SpeedParameter:
-  m_MirrorParameter:
-  m_CycleOffsetParameter:
-  m_TimeParameter:
---- !u!1101 &1101956084455425907
-AnimatorStateTransition:
-  serializedVersion: 3
-  m_ObjectHideFlags: 1
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_Name:
-  m_Conditions:
-  - m_ConditionMode: 2
-    m_ConditionEvent: PlayFire
-    m_EventTreshold: 0
-  m_DstStateMachine: {fileID: 0}
-  m_DstState: {fileID: 1102586851107390720}
-  m_Solo: 0
-  m_Mute: 0
-  m_IsExit: 0
-  m_TransitionDuration: 0.1
-  m_TransitionOffset: 0
-  m_ExitTime: 0.9
-  m_HasExitTime: 0
-  m_HasFixedDuration: 1
-  m_InterruptionSource: 0
-  m_OrderedInterruption: 1
-  m_CanTransitionToSelf: 1
---- !u!1101 &1101553156517545971
-AnimatorStateTransition:
-  serializedVersion: 3
-  m_ObjectHideFlags: 1
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_Name:
+  m_Name: 
   m_Conditions:
   - m_ConditionMode: 7
     m_ConditionEvent: FireIndex
@@ -389,6 +105,7 @@ AnimatorStateTransition:
   m_Solo: 0
   m_Mute: 0
   m_IsExit: 1
+  serializedVersion: 3
   m_TransitionDuration: 0.1
   m_TransitionOffset: 0
   m_ExitTime: 0.9
@@ -397,6 +114,228 @@ AnimatorStateTransition:
   m_InterruptionSource: 0
   m_OrderedInterruption: 1
   m_CanTransitionToSelf: 1
+--- !u!1101 &1101391924739708828
+AnimatorStateTransition:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: 
+  m_Conditions:
+  - m_ConditionMode: 2
+    m_ConditionEvent: PlayFire
+    m_EventTreshold: 0
+  m_DstStateMachine: {fileID: 0}
+  m_DstState: {fileID: 1102586851107390720}
+  m_Solo: 0
+  m_Mute: 0
+  m_IsExit: 0
+  serializedVersion: 3
+  m_TransitionDuration: 0.1
+  m_TransitionOffset: 0
+  m_ExitTime: 0.9
+  m_HasExitTime: 0
+  m_HasFixedDuration: 1
+  m_InterruptionSource: 0
+  m_OrderedInterruption: 1
+  m_CanTransitionToSelf: 1
+--- !u!1101 &1101511246989886340
+AnimatorStateTransition:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: 
+  m_Conditions:
+  - m_ConditionMode: 2
+    m_ConditionEvent: PlayFire
+    m_EventTreshold: 0
+  m_DstStateMachine: {fileID: 0}
+  m_DstState: {fileID: 0}
+  m_Solo: 0
+  m_Mute: 0
+  m_IsExit: 1
+  serializedVersion: 3
+  m_TransitionDuration: 0.1
+  m_TransitionOffset: 0
+  m_ExitTime: 0.9
+  m_HasExitTime: 1
+  m_HasFixedDuration: 1
+  m_InterruptionSource: 0
+  m_OrderedInterruption: 1
+  m_CanTransitionToSelf: 1
+--- !u!1101 &1101553156517545971
+AnimatorStateTransition:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: 
+  m_Conditions:
+  - m_ConditionMode: 7
+    m_ConditionEvent: FireIndex
+    m_EventTreshold: 1
+  m_DstStateMachine: {fileID: 0}
+  m_DstState: {fileID: 0}
+  m_Solo: 0
+  m_Mute: 0
+  m_IsExit: 1
+  serializedVersion: 3
+  m_TransitionDuration: 0.1
+  m_TransitionOffset: 0
+  m_ExitTime: 0.9
+  m_HasExitTime: 0
+  m_HasFixedDuration: 1
+  m_InterruptionSource: 0
+  m_OrderedInterruption: 1
+  m_CanTransitionToSelf: 1
+--- !u!1101 &1101688272981504240
+AnimatorStateTransition:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: 
+  m_Conditions:
+  - m_ConditionMode: 7
+    m_ConditionEvent: FireIndex
+    m_EventTreshold: 1
+  m_DstStateMachine: {fileID: 0}
+  m_DstState: {fileID: 0}
+  m_Solo: 0
+  m_Mute: 0
+  m_IsExit: 1
+  serializedVersion: 3
+  m_TransitionDuration: 0.1
+  m_TransitionOffset: 0
+  m_ExitTime: 0.9
+  m_HasExitTime: 0
+  m_HasFixedDuration: 1
+  m_InterruptionSource: 0
+  m_OrderedInterruption: 1
+  m_CanTransitionToSelf: 1
+--- !u!1101 &1101829879740029450
+AnimatorStateTransition:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: 
+  m_Conditions:
+  - m_ConditionMode: 7
+    m_ConditionEvent: FireIndex
+    m_EventTreshold: 0
+  m_DstStateMachine: {fileID: 0}
+  m_DstState: {fileID: 0}
+  m_Solo: 0
+  m_Mute: 0
+  m_IsExit: 1
+  serializedVersion: 3
+  m_TransitionDuration: 0.1
+  m_TransitionOffset: 0
+  m_ExitTime: 0.9
+  m_HasExitTime: 0
+  m_HasFixedDuration: 1
+  m_InterruptionSource: 0
+  m_OrderedInterruption: 1
+  m_CanTransitionToSelf: 1
+--- !u!1101 &1101862646630383199
+AnimatorStateTransition:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: 
+  m_Conditions:
+  - m_ConditionMode: 2
+    m_ConditionEvent: PlayFire
+    m_EventTreshold: 0
+  m_DstStateMachine: {fileID: 0}
+  m_DstState: {fileID: 0}
+  m_Solo: 0
+  m_Mute: 0
+  m_IsExit: 1
+  serializedVersion: 3
+  m_TransitionDuration: 0.1
+  m_TransitionOffset: 0
+  m_ExitTime: 0.9
+  m_HasExitTime: 1
+  m_HasFixedDuration: 1
+  m_InterruptionSource: 0
+  m_OrderedInterruption: 1
+  m_CanTransitionToSelf: 1
+--- !u!1101 &1101941886602571589
+AnimatorStateTransition:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: 
+  m_Conditions:
+  - m_ConditionMode: 1
+    m_ConditionEvent: PlayFire
+    m_EventTreshold: 0
+  m_DstStateMachine: {fileID: 0}
+  m_DstState: {fileID: 1102215423201716925}
+  m_Solo: 0
+  m_Mute: 0
+  m_IsExit: 0
+  serializedVersion: 3
+  m_TransitionDuration: 0.1
+  m_TransitionOffset: 0
+  m_ExitTime: 0.9
+  m_HasExitTime: 0
+  m_HasFixedDuration: 1
+  m_InterruptionSource: 0
+  m_OrderedInterruption: 1
+  m_CanTransitionToSelf: 1
+--- !u!1101 &1101956084455425907
+AnimatorStateTransition:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: 
+  m_Conditions:
+  - m_ConditionMode: 2
+    m_ConditionEvent: PlayFire
+    m_EventTreshold: 0
+  m_DstStateMachine: {fileID: 0}
+  m_DstState: {fileID: 1102586851107390720}
+  m_Solo: 0
+  m_Mute: 0
+  m_IsExit: 0
+  serializedVersion: 3
+  m_TransitionDuration: 0.1
+  m_TransitionOffset: 0
+  m_ExitTime: 0.9
+  m_HasExitTime: 0
+  m_HasFixedDuration: 1
+  m_InterruptionSource: 0
+  m_OrderedInterruption: 1
+  m_CanTransitionToSelf: 1
+--- !u!1101 &1101994363976137711
+AnimatorStateTransition:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: 
+  m_Conditions: []
+  m_DstStateMachine: {fileID: 0}
+  m_DstState: {fileID: 1102872234582746100}
+  m_Solo: 0
+  m_Mute: 0
+  m_IsExit: 0
+  serializedVersion: 3
+  m_TransitionDuration: 0.1
+  m_TransitionOffset: 0
+  m_ExitTime: 0.9
+  m_HasExitTime: 1
+  m_HasFixedDuration: 1
+  m_InterruptionSource: 0
+  m_OrderedInterruption: 1
+  m_CanTransitionToSelf: 1
 --- !u!1102 &1102215423201716925
 AnimatorState:
   serializedVersion: 6
@@ -421,83 +360,66 @@ AnimatorState:
   m_CycleOffsetParameterActive: 0
   m_TimeParameterActive: 0
   m_Motion: {fileID: 7400000, guid: f360fc6483f935748a82c4e7f8100e09, type: 2}
-  m_Tag:
-  m_SpeedParameter:
-  m_MirrorParameter:
-  m_CycleOffsetParameter:
-  m_TimeParameter:
---- !u!1101 &1101994363976137711
-AnimatorStateTransition:
-  serializedVersion: 3
+  m_Tag: 
+  m_SpeedParameter: 
+  m_MirrorParameter: 
+  m_CycleOffsetParameter: 
+  m_TimeParameter: 
+--- !u!1102 &1102297467249740649
+AnimatorState:
+  serializedVersion: 6
   m_ObjectHideFlags: 1
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_Name:
-  m_Conditions: []
-  m_DstStateMachine: {fileID: 0}
-  m_DstState: {fileID: 1102872234582746100}
-  m_Solo: 0
-  m_Mute: 0
-  m_IsExit: 0
-  m_TransitionDuration: 0.1
-  m_TransitionOffset: 0
-  m_ExitTime: 0.9
-  m_HasExitTime: 1
-  m_HasFixedDuration: 1
-  m_InterruptionSource: 0
-  m_OrderedInterruption: 1
-  m_CanTransitionToSelf: 1
---- !u!1101 &1101391924739708828
-AnimatorStateTransition:
-  serializedVersion: 3
+  m_Name: fire_0
+  m_Speed: 1
+  m_CycleOffset: 0
+  m_Transitions:
+  - {fileID: 1101511246989886340}
+  - {fileID: 1101829879740029450}
+  m_StateMachineBehaviours: []
+  m_Position: {x: 0, y: 0, z: 0}
+  m_IKOnFeet: 0
+  m_WriteDefaultValues: 1
+  m_Mirror: 0
+  m_SpeedParameterActive: 0
+  m_MirrorParameterActive: 0
+  m_CycleOffsetParameterActive: 0
+  m_TimeParameterActive: 0
+  m_Motion: {fileID: 7400000, guid: be75a1451b44aae4dbe892b9396dd77f, type: 2}
+  m_Tag: 
+  m_SpeedParameter: 
+  m_MirrorParameter: 
+  m_CycleOffsetParameter: 
+  m_TimeParameter: 
+--- !u!1102 &1102576693374580535
+AnimatorState:
+  serializedVersion: 6
   m_ObjectHideFlags: 1
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_Name:
-  m_Conditions:
-  - m_ConditionMode: 2
-    m_ConditionEvent: PlayFire
-    m_EventTreshold: 0
-  m_DstStateMachine: {fileID: 0}
-  m_DstState: {fileID: 1102586851107390720}
-  m_Solo: 0
-  m_Mute: 0
-  m_IsExit: 0
-  m_TransitionDuration: 0.1
-  m_TransitionOffset: 0
-  m_ExitTime: 0.9
-  m_HasExitTime: 0
-  m_HasFixedDuration: 1
-  m_InterruptionSource: 0
-  m_OrderedInterruption: 1
-  m_CanTransitionToSelf: 1
---- !u!1101 &1101688272981504240
-AnimatorStateTransition:
-  serializedVersion: 3
-  m_ObjectHideFlags: 1
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_Name:
-  m_Conditions:
-  - m_ConditionMode: 7
-    m_ConditionEvent: FireIndex
-    m_EventTreshold: 1
-  m_DstStateMachine: {fileID: 0}
-  m_DstState: {fileID: 0}
-  m_Solo: 0
-  m_Mute: 0
-  m_IsExit: 1
-  m_TransitionDuration: 0.1
-  m_TransitionOffset: 0
-  m_ExitTime: 0.9
-  m_HasExitTime: 0
-  m_HasFixedDuration: 1
-  m_InterruptionSource: 0
-  m_OrderedInterruption: 1
-  m_CanTransitionToSelf: 1
+  m_Name: Idle0
+  m_Speed: 1
+  m_CycleOffset: 0
+  m_Transitions:
+  - {fileID: 1101021321593431017}
+  m_StateMachineBehaviours: []
+  m_Position: {x: 0, y: 0, z: 0}
+  m_IKOnFeet: 0
+  m_WriteDefaultValues: 1
+  m_Mirror: 0
+  m_SpeedParameterActive: 0
+  m_MirrorParameterActive: 0
+  m_CycleOffsetParameterActive: 0
+  m_TimeParameterActive: 0
+  m_Motion: {fileID: 7400000, guid: c536a856270d2cb46a2678876203c774, type: 2}
+  m_Tag: Idle
+  m_SpeedParameter: 
+  m_MirrorParameter: 
+  m_CycleOffsetParameter: 
+  m_TimeParameter: 
 --- !u!1102 &1102586851107390720
 AnimatorState:
   serializedVersion: 6
@@ -522,109 +444,180 @@ AnimatorState:
   m_CycleOffsetParameterActive: 0
   m_TimeParameterActive: 0
   m_Motion: {fileID: 7400000, guid: 511aef394d51caa4b8821cc7b13cd470, type: 2}
-  m_Tag:
-  m_SpeedParameter:
-  m_MirrorParameter:
-  m_CycleOffsetParameter:
-  m_TimeParameter:
---- !u!1101 &1101941886602571589
-AnimatorStateTransition:
-  serializedVersion: 3
+  m_Tag: 
+  m_SpeedParameter: 
+  m_MirrorParameter: 
+  m_CycleOffsetParameter: 
+  m_TimeParameter: 
+--- !u!1102 &1102872234582746100
+AnimatorState:
+  serializedVersion: 6
   m_ObjectHideFlags: 1
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_Name:
-  m_Conditions:
-  - m_ConditionMode: 1
-    m_ConditionEvent: PlayFire
-    m_EventTreshold: 0
-  m_DstStateMachine: {fileID: 0}
-  m_DstState: {fileID: 1102215423201716925}
-  m_Solo: 0
-  m_Mute: 0
-  m_IsExit: 0
-  m_TransitionDuration: 0.1
-  m_TransitionOffset: 0
-  m_ExitTime: 0.9
-  m_HasExitTime: 0
-  m_HasFixedDuration: 1
-  m_InterruptionSource: 0
-  m_OrderedInterruption: 1
-  m_CanTransitionToSelf: 1
---- !u!1101 &1101862646630383199
-AnimatorStateTransition:
-  serializedVersion: 3
+  m_Name: fire_1
+  m_Speed: 1
+  m_CycleOffset: 0
+  m_Transitions:
+  - {fileID: 1101956084455425907}
+  - {fileID: 1101553156517545971}
+  m_StateMachineBehaviours: []
+  m_Position: {x: 0, y: 0, z: 0}
+  m_IKOnFeet: 0
+  m_WriteDefaultValues: 1
+  m_Mirror: 0
+  m_SpeedParameterActive: 0
+  m_MirrorParameterActive: 0
+  m_CycleOffsetParameterActive: 0
+  m_TimeParameterActive: 0
+  m_Motion: {fileID: 7400000, guid: b918c3e41a32cde4a91630a56a316977, type: 2}
+  m_Tag: 
+  m_SpeedParameter: 
+  m_MirrorParameter: 
+  m_CycleOffsetParameter: 
+  m_TimeParameter: 
+--- !u!1107 &1107058171320156754
+AnimatorStateMachine:
+  serializedVersion: 6
   m_ObjectHideFlags: 1
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_Name:
-  m_Conditions:
-  - m_ConditionMode: 2
-    m_ConditionEvent: PlayFire
-    m_EventTreshold: 0
-  m_DstStateMachine: {fileID: 0}
-  m_DstState: {fileID: 0}
-  m_Solo: 0
-  m_Mute: 0
-  m_IsExit: 1
-  m_TransitionDuration: 0.1
-  m_TransitionOffset: 0
-  m_ExitTime: 0.9
-  m_HasExitTime: 1
-  m_HasFixedDuration: 1
-  m_InterruptionSource: 0
-  m_OrderedInterruption: 1
-  m_CanTransitionToSelf: 1
---- !u!1101 &1101245751037863158
-AnimatorStateTransition:
-  serializedVersion: 3
+  m_Name: Idle
+  m_ChildStates:
+  - serializedVersion: 1
+    m_State: {fileID: 1102576693374580535}
+    m_Position: {x: 0, y: 0, z: 0}
+  m_ChildStateMachines: []
+  m_AnyStateTransitions: []
+  m_EntryTransitions: []
+  m_StateMachineTransitions: {}
+  m_StateMachineBehaviours: []
+  m_AnyStatePosition: {x: -130, y: -110, z: 0}
+  m_EntryPosition: {x: 250, y: -100, z: 0}
+  m_ExitPosition: {x: 500, y: -100, z: 0}
+  m_ParentStateMachinePosition: {x: 0, y: -200, z: 0}
+  m_DefaultState: {fileID: 1102576693374580535}
+--- !u!1107 &1107141658647961963
+AnimatorStateMachine:
+  serializedVersion: 6
   m_ObjectHideFlags: 1
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_Name:
-  m_Conditions:
-  - m_ConditionMode: 7
-    m_ConditionEvent: FireIndex
-    m_EventTreshold: 1
-  m_DstStateMachine: {fileID: 0}
-  m_DstState: {fileID: 0}
-  m_Solo: 0
-  m_Mute: 0
-  m_IsExit: 1
-  m_TransitionDuration: 0.1
-  m_TransitionOffset: 0
-  m_ExitTime: 0.9
-  m_HasExitTime: 0
-  m_HasFixedDuration: 1
-  m_InterruptionSource: 0
-  m_OrderedInterruption: 1
-  m_CanTransitionToSelf: 1
---- !u!1109 &1109308842003191360
-AnimatorTransition:
+  m_Name: fire1
+  m_ChildStates:
+  - serializedVersion: 1
+    m_State: {fileID: 1102872234582746100}
+    m_Position: {x: 0, y: 0, z: 0}
+  - serializedVersion: 1
+    m_State: {fileID: 1102215423201716925}
+    m_Position: {x: 240, y: -110, z: 0}
+  - serializedVersion: 1
+    m_State: {fileID: 1102586851107390720}
+    m_Position: {x: 0, y: 100, z: 0}
+  m_ChildStateMachines: []
+  m_AnyStateTransitions: []
+  m_EntryTransitions: []
+  m_StateMachineTransitions: {}
+  m_StateMachineBehaviours: []
+  m_AnyStatePosition: {x: 0, y: -100, z: 0}
+  m_EntryPosition: {x: 260, y: -220, z: 0}
+  m_ExitPosition: {x: 500, y: -100, z: 0}
+  m_ParentStateMachinePosition: {x: 0, y: -200, z: 0}
+  m_DefaultState: {fileID: 1102215423201716925}
+--- !u!1107 &1107386386589132418
+AnimatorStateMachine:
+  serializedVersion: 6
   m_ObjectHideFlags: 1
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_Name:
-  m_Conditions:
-  - m_ConditionMode: 6
-    m_ConditionEvent: FireIndex
-    m_EventTreshold: 1
-  m_DstStateMachine: {fileID: 1107141658647961963}
-  m_DstState: {fileID: 0}
-  m_Solo: 0
-  m_Mute: 0
-  m_IsExit: 0
+  m_Name: Fire
+  m_ChildStates: []
+  m_ChildStateMachines:
+  - serializedVersion: 1
+    m_StateMachine: {fileID: 1107643901766864274}
+    m_Position: {x: 0, y: 0, z: 0}
+  - serializedVersion: 1
+    m_StateMachine: {fileID: 1107141658647961963}
+    m_Position: {x: 310, y: 20, z: 0}
+  m_AnyStateTransitions: []
+  m_EntryTransitions:
+  - {fileID: 1109308842003191360}
+  m_StateMachineTransitions:
+  - first: {fileID: 1107643901766864274}
+    second:
+    - {fileID: 1109089921127702195}
+    - {fileID: 1109485448914599082}
+  - first: {fileID: 1107141658647961963}
+    second:
+    - {fileID: 1109987611724976417}
+    - {fileID: 1109621476171100876}
+  m_StateMachineBehaviours: []
+  m_AnyStatePosition: {x: 0, y: -100, z: 0}
+  m_EntryPosition: {x: 250, y: -100, z: 0}
+  m_ExitPosition: {x: 500, y: -100, z: 0}
+  m_ParentStateMachinePosition: {x: 0, y: -200, z: 0}
+  m_DefaultState: {fileID: 1102297467249740649}
+--- !u!1107 &1107643901766864274
+AnimatorStateMachine:
+  serializedVersion: 6
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: fire0
+  m_ChildStates:
+  - serializedVersion: 1
+    m_State: {fileID: 1102297467249740649}
+    m_Position: {x: 0, y: 0, z: 0}
+  m_ChildStateMachines: []
+  m_AnyStateTransitions: []
+  m_EntryTransitions: []
+  m_StateMachineTransitions: {}
+  m_StateMachineBehaviours: []
+  m_AnyStatePosition: {x: 0, y: -100, z: 0}
+  m_EntryPosition: {x: 250, y: -100, z: 0}
+  m_ExitPosition: {x: 500, y: -100, z: 0}
+  m_ParentStateMachinePosition: {x: 0, y: -200, z: 0}
+  m_DefaultState: {fileID: 1102297467249740649}
+--- !u!1107 &1107873374580099368
+AnimatorStateMachine:
+  serializedVersion: 6
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: Base Layer
+  m_ChildStates: []
+  m_ChildStateMachines:
+  - serializedVersion: 1
+    m_StateMachine: {fileID: 1107058171320156754}
+    m_Position: {x: 0, y: 0, z: 0}
+  - serializedVersion: 1
+    m_StateMachine: {fileID: 1107386386589132418}
+    m_Position: {x: 250, y: 0, z: 0}
+  m_AnyStateTransitions: []
+  m_EntryTransitions: []
+  m_StateMachineTransitions:
+  - first: {fileID: 1107386386589132418}
+    second:
+    - {fileID: 1109294262637612309}
+  m_StateMachineBehaviours: []
+  m_AnyStatePosition: {x: 0, y: -100, z: 0}
+  m_EntryPosition: {x: 250, y: -100, z: 0}
+  m_ExitPosition: {x: 500, y: -100, z: 0}
+  m_ParentStateMachinePosition: {x: 0, y: -200, z: 0}
+  m_DefaultState: {fileID: 1102576693374580535}
 --- !u!1109 &1109089921127702195
 AnimatorTransition:
   m_ObjectHideFlags: 1
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_Name:
+  m_Name: 
   m_Conditions:
   - m_ConditionMode: 2
     m_ConditionEvent: PlayFire
@@ -634,13 +627,28 @@ AnimatorTransition:
   m_Solo: 0
   m_Mute: 0
   m_IsExit: 1
---- !u!1109 &1109485448914599082
+  serializedVersion: 1
+--- !u!1109 &1109294262637612309
 AnimatorTransition:
   m_ObjectHideFlags: 1
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_Name:
+  m_Name: 
+  m_Conditions: []
+  m_DstStateMachine: {fileID: 1107058171320156754}
+  m_DstState: {fileID: 0}
+  m_Solo: 0
+  m_Mute: 0
+  m_IsExit: 0
+  serializedVersion: 1
+--- !u!1109 &1109308842003191360
+AnimatorTransition:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: 
   m_Conditions:
   - m_ConditionMode: 6
     m_ConditionEvent: FireIndex
@@ -650,29 +658,31 @@ AnimatorTransition:
   m_Solo: 0
   m_Mute: 0
   m_IsExit: 0
---- !u!1109 &1109987611724976417
+  serializedVersion: 1
+--- !u!1109 &1109485448914599082
 AnimatorTransition:
   m_ObjectHideFlags: 1
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_Name:
+  m_Name: 
   m_Conditions:
-  - m_ConditionMode: 2
-    m_ConditionEvent: PlayFire
-    m_EventTreshold: 0
-  m_DstStateMachine: {fileID: 0}
+  - m_ConditionMode: 6
+    m_ConditionEvent: FireIndex
+    m_EventTreshold: 1
+  m_DstStateMachine: {fileID: 1107141658647961963}
   m_DstState: {fileID: 0}
   m_Solo: 0
   m_Mute: 0
-  m_IsExit: 1
+  m_IsExit: 0
+  serializedVersion: 1
 --- !u!1109 &1109621476171100876
 AnimatorTransition:
   m_ObjectHideFlags: 1
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_Name:
+  m_Name: 
   m_Conditions:
   - m_ConditionMode: 6
     m_ConditionEvent: FireIndex
@@ -682,16 +692,21 @@ AnimatorTransition:
   m_Solo: 0
   m_Mute: 0
   m_IsExit: 0
---- !u!1109 &1109294262637612309
+  serializedVersion: 1
+--- !u!1109 &1109987611724976417
 AnimatorTransition:
   m_ObjectHideFlags: 1
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_Name:
-  m_Conditions: []
-  m_DstStateMachine: {fileID: 1107058171320156754}
+  m_Name: 
+  m_Conditions:
+  - m_ConditionMode: 2
+    m_ConditionEvent: PlayFire
+    m_EventTreshold: 0
+  m_DstStateMachine: {fileID: 0}
   m_DstState: {fileID: 0}
   m_Solo: 0
   m_Mute: 0
-  m_IsExit: 0
+  m_IsExit: 1
+  serializedVersion: 1
diff --git a/Assets/MyGame/Scripts/Manager/CreateFishManager.cs b/Assets/MyGame/Scripts/Manager/CreateFishManager.cs
index 68039eeda..7d4eac28d 100644
--- a/Assets/MyGame/Scripts/Manager/CreateFishManager.cs
+++ b/Assets/MyGame/Scripts/Manager/CreateFishManager.cs
@@ -1513,8 +1513,11 @@ public class CreateFishManager : MonoSingleton<CreateFishManager>
         {
             if (sit.monCotl_Lock != null && sit.monCotl_Lock.guid == fishId)
             {
-                sit.monCotl_Lock = null;
-                sit.monCotl_Lock_Position = null;
+                // ⭐ 必须完整清锁(ClearLock 置 isLock=false/隐藏锁定圈/重置 isManualLock/炮台回Idle),
+                //   不能只清两个引用:isLock 残留 true 会让 GameMainPanel_FishBase.HandleAutoRotate
+                //   对空 monCotl_Lock_Position 取 .position 每帧抛 NRE,
+                //   排在其后的 CheckLockTargetValid/HandleAutoLock 永远执行不到 → 锁定系统卡死
+                sit.ClearLock();
             }
         }
     }
diff --git a/Assets/MyGame/Scripts/Turret/SitPosData.cs b/Assets/MyGame/Scripts/Turret/SitPosData.cs
index 8d738ffe2..0676b1f27 100644
--- a/Assets/MyGame/Scripts/Turret/SitPosData.cs
+++ b/Assets/MyGame/Scripts/Turret/SitPosData.cs
@@ -85,6 +85,12 @@ public class SitPosData : MonoBehaviour
     [System.NonSerialized]
     public TurretData currentZhanShenData;
 
+    // -------------------------
+    // 战神激光（锁定时显示）
+    // -------------------------
+    /// <summary>战神激光对象列表（世界空间 LineRenderer，起点=子弹创建位置，终点=锁定鱼的位置）。三发锁定=3条</summary>
+    private readonly List<LineRenderer> _zhanShenLasers = new List<LineRenderer>();
+
     // -------------------------
     // XJMH 炮台列表（星际迷航专用）
     // -------------------------
@@ -214,6 +220,142 @@ public class SitPosData : MonoBehaviour
             roomOwnerSit = null;
             TransferRoomOwner();
         }
+        // 座位禁用时清理战神激光（世界空间对象，不随座位隐藏）
+        DestroyZhanShenLaser();
+    }
+
+    private void Update()
+    {
+        UpdateZhanShenLaser();
+    }
+
+    // ==================== 战神激光（锁定时显示） ====================
+
+    /// <summary>
+    /// 战神锁定时显示激光（LineRenderer）：起点=创建子弹的位置(GetBulletStartPos)，终点=锁定鱼的位置。
+    /// ⭐ 一个锁定点一条线：单发锁定=1条，三发锁定=3条（主目标+2个三发目标）。
+    /// ⭐ 只是视觉表现：打中鱼仍按正常攻击频率由子弹完成（HandleAutoFire 以 attackTime 发射锁定子弹）。
+    /// 普通炮台没有此效果（currentZhanShenData 为 null 时不显示）。
+    /// </summary>
+    private void UpdateZhanShenLaser()
+    {
+        // 收集所有有效锁定点：主目标 + 三发锁定的额外目标
+        _laserTargets.Clear();
+        if (currentZhanShenData != null && isLock)
+        {
+            if (monCotl_Lock_Position != null && monCotl_Lock_Position.gameObject.activeInHierarchy)
+                _laserTargets.Add(monCotl_Lock_Position);
+
+            // 三发锁定：每个有效目标一条线（主目标已在上面，这里只补额外的）
+            if (tripleLockTargets.Count > 0)
+            {
+                for (int i = 0; i < tripleLockTargets.Count && i < tripleLockPositions.Count; i++)
+                {
+                    var pos = tripleLockPositions[i];
+                    var mon = tripleLockTargets[i];
+                    // 主目标(monCotl_Lock)已在上面加过，跳过避免重复
+                    if (mon == monCotl_Lock) continue;
+                    if (mon == null || mon.isDead || pos == null || !pos.gameObject.activeInHierarchy) continue;
+                    _laserTargets.Add(pos);
+                }
+            }
+        }
+
+        // 没有锁定点：隐藏所有激光
+        if (_laserTargets.Count == 0)
+        {
+            for (int i = 0; i < _zhanShenLasers.Count; i++)
+            {
+                if (_zhanShenLasers[i] != null && _zhanShenLasers[i].gameObject.activeSelf)
+                    _zhanShenLasers[i].gameObject.SetActive(false);
+            }
+            return;
+        }
+
+        // 起点：创建子弹的位置（世界坐标 Z=0 平面，和 FireBullet 的 startPos 一致）
+        Vector3 start = GetBulletStartPos();
+        start.z = 0f;
+
+        // 需要几条就创建几条（三发=3个 LineRenderer），多余的隐藏
+        for (int i = 0; i < _laserTargets.Count; i++)
+        {
+            var line = i < _zhanShenLasers.Count ? _zhanShenLasers[i] : CreateZhanShenLaser(i);
+            if (line == null) continue;
+            if (!line.gameObject.activeSelf)
+                line.gameObject.SetActive(true);
+
+            // 终点：该条锁定鱼的位置
+            Vector3 end = _laserTargets[i].position;
+            end.z = 0f;
+            line.SetPosition(0, start);
+            line.SetPosition(1, end);
+        }
+        for (int i = _laserTargets.Count; i < _zhanShenLasers.Count; i++)
+        {
+            if (_zhanShenLasers[i] != null && _zhanShenLasers[i].gameObject.activeSelf)
+                _zhanShenLasers[i].gameObject.SetActive(false);
+        }
+    }
+
+    /// <summary>激光终点缓存列表（每帧复用，避免 GC）</summary>
+    private readonly List<Transform> _laserTargets = new List<Transform>();
+
+    /// <summary>
+    /// 创建一条战神激光（第 index 条）：
+    /// - laserPrefab 非空 → 克隆预制体（LineRenderer 配置以预制体为准）；
+    /// - laserPrefab 为空 → 直接创建一个新 GameObject 并加上 LineRenderer（用 TurretData 上的宽度/颜色）。
+    /// </summary>
+    private LineRenderer CreateZhanShenLaser(int index)
+    {
+        var zsData = currentZhanShenData;
+        GameObject laserGo;
+        LineRenderer line;
+
+        if (zsData.laserPrefab != null)
+        {
+            laserGo = Instantiate(zsData.laserPrefab);
+            laserGo.name = $"ZhanShenLaser_{index}";
+            line = laserGo.GetComponent<LineRenderer>();
+            if (line == null)
+                line = laserGo.AddComponent<LineRenderer>();
+        }
+        else
+        {
+            // ⭐ prefab 为空：直接新建对象 + LineRenderer
+            laserGo = new GameObject($"ZhanShenLaser_{index}");
+            line = laserGo.AddComponent<LineRenderer>();
+        }
+
+        // 公共配置：两个端点
+        line.positionCount = Mathf.Max(line.positionCount, 2);
+        laserGo.transform.SetParent(null);   // 世界空间，不随座位/炮台旋转
+
+        if (zsData.laserPrefab == null)
+        {
+            // 自动创建时应用 TurretData 上的宽度/颜色/材质
+            line.startWidth = zsData.laserWidth;
+            line.endWidth = zsData.laserWidth;
+            line.startColor = zsData.laserColor;
+            line.endColor = zsData.laserColor;
+            var shader = Shader.Find("Sprites/Default");
+            if (shader != null)
+                line.material = new Material(shader) { color = Color.white };
+            line.useWorldSpace = true;
+        }
+
+        _zhanShenLasers.Add(line);
+        return line;
+    }
+
+    /// <summary>销毁所有战神激光对象（清战神/座位禁用时调用）</summary>
+    private void DestroyZhanShenLaser()
+    {
+        for (int i = 0; i < _zhanShenLasers.Count; i++)
+        {
+            if (_zhanShenLasers[i] != null)
+                Destroy(_zhanShenLasers[i].gameObject);
+        }
+        _zhanShenLasers.Clear();
     }
 
     /// <summary>
@@ -645,6 +787,7 @@ public class SitPosData : MonoBehaviour
         if (zsData != null)
         {
             zsData.turretNumber = zhanShenNumber;
+            zsData.setPosData = this;   // 注入座位引用：FireIndex 动态切换(锁定=1激光/非锁定=0子弹)需要查锁定状态
             OnStateChange = zsData.ChangeState;
         }
 
@@ -692,6 +835,8 @@ public class SitPosData : MonoBehaviour
         }
         currentZhanShen = null;
         currentZhanShenData = null;
+        // 战神清了激光也没了
+        DestroyZhanShenLaser();
     }
     // -------------------------
     // 切换状态（GameMainPanel 调用）
diff --git a/Assets/MyGame/Scripts/Turret/TurretData.cs b/Assets/MyGame/Scripts/Turret/TurretData.cs
index e59eb25d0..56a8e62da 100644
--- a/Assets/MyGame/Scripts/Turret/TurretData.cs
+++ b/Assets/MyGame/Scripts/Turret/TurretData.cs
@@ -34,6 +34,14 @@ public class TurretData : MonoBehaviour
     public GameObject bulletPrefab_Two;
     public GameObject bulletPrefab;
 
+    [Header("战神激光（锁定时显示，普通炮台不配置即无此效果）")]
+    [Tooltip("激光预制体（带 LineRenderer）。为空时自动创建一个 GameObject 并加 LineRenderer")]
+    public GameObject laserPrefab;
+    [Tooltip("自动创建激光时的线宽")]
+    public float laserWidth = 0.3f;
+    [Tooltip("自动创建激光时的颜色")]
+    public Color laserColor = new Color(1f, 0.3f, 0.3f, 0.9f);
+
     [Header("UI面板属性")]
     [Tooltip("炮台编号，对应 TurretResourcesData.turretNumber")]
     public int turretNumber;
@@ -77,11 +85,11 @@ public class TurretData : MonoBehaviour
     [Tooltip("战神状态机开火参数名（Bool：Idle0 --PlayFire--> Fire状态机，Fire --PlayFire=false--> Exit回Idle）。" +
              "检测到此参数自动启用战神模式，无需手动配置")]
     public string playFireParam = "PlayFire";
-    [Tooltip("开火动画变体参数名（Int：FireIndex=0选Fire0，=1选Fire1...）")]
+    [Tooltip("开火动画变体参数名（Int）：0=Fire0(正常子弹)  1=Fire1(激光)。锁定时自动切1，非锁定开火用0")]
     public string fireIndexParam = "FireIndex";
     [Tooltip("待机动画变体参数名（Int：IdleIndex=0选Idle0...）")]
     public string idleIndexParam = "IdleIndex";
-    [Tooltip("开火动画变体索引：0=Fire0  1=Fire1...")]
+    [Tooltip("开火动画变体索引默认值：0=Fire0(正常子弹)  1=Fire1(激光)。运行时按锁定状态自动切换，此值仅为无锁定信息时的兜底")]
     public int fireIndex = 0;
     [Tooltip("待机动画变体索引：0=Idle0  1=Idle1...")]
     public int idleIndex = 0;
@@ -446,6 +454,7 @@ public class TurretData : MonoBehaviour
     /// - Bool 型（标准）：Attack 置 true 持续开火，Idle 置 false 停火退出；
     /// - Trigger 型（兜底）：Attack 设触发器，Idle 复位。
     /// LaserStart/LaserLoop 视为开火中，None/LaserEnd 视为待机。
+    /// ⭐ FireIndex 动态切换：锁定中(激光开启)=1 走 Fire1(激光动画)；非锁定=0 走 Fire0(正常子弹动画)。
     /// </summary>
     private void PlayWarGodAnimator(TurretState state)
     {
@@ -453,6 +462,10 @@ public class TurretData : MonoBehaviour
             || state == TurretState.LaserStart
             || state == TurretState.LaserLoop;
 
+        // ⭐ 开火变体：0=正常子弹  1=激光（锁定中）。进 Fire 状态机前先设好值
+        if (attacking && _hasFireIndex)
+            SetNumericParam(fireIndexParam, _fireIndexType, IsLaserActive() ? 1 : 0);
+
         if (_playFireIsTrigger)
         {
             if (attacking) new_CurrAnimation.SetTrigger(playFireParam);
@@ -464,6 +477,19 @@ public class TurretData : MonoBehaviour
         }
     }
 
+    /// <summary>
+    /// 激光是否开启：战神锁定中即激光开启（与 SitPosData.UpdateZhanShenLaser 的显示条件一致）。
+    /// setPosData 由 SitPosData.LoadZhanShen 注入；远程座位的锁定经 SetLockTarget 同步，同样生效。
+    /// </summary>
+    private bool IsLaserActive()
+    {
+        var sit = setPosData;
+        return sit != null
+            && sit.isLock
+            && sit.monCotl_Lock_Position != null
+            && sit.monCotl_Lock_Position.gameObject.activeInHierarchy;
+    }
+
     /// <summary>按参数实际类型写数值（Int/Bool/Float 通吃）</summary>
     private void SetNumericParam(string paramName, AnimatorControllerParameterType type, int value)
     {
diff --git a/Assets/MyGame/aa/Game/ZhanShen/Game/display_wargod_in_14053_0_dev.prefab b/Assets/MyGame/aa/Game/ZhanShen/Game/display_wargod_in_14053_0_dev.prefab
index 5187beb7e..e8af5bcd5 100644
--- a/Assets/MyGame/aa/Game/ZhanShen/Game/display_wargod_in_14053_0_dev.prefab
+++ b/Assets/MyGame/aa/Game/ZhanShen/Game/display_wargod_in_14053_0_dev.prefab
@@ -931,8 +931,11 @@ MonoBehaviour:
   tra_BulletStartPosition: {fileID: 0}
   tra_RotationPivot: {fileID: 0}
   bulletPrefab_Two: {fileID: 0}
-  bulletPrefab: {fileID: 1683896124520709, guid: 7285e1bb1bde04640832e1569f3b636c,
+  bulletPrefab: {fileID: 6300000819753586713, guid: b8f336cf2aed76541ae9e48d99280a5b,
     type: 3}
+  laserPrefab: {fileID: 0}
+  laserWidth: 3
+  laserColor: {r: 1, g: 0.3, b: 0.3, a: 0.9}
   turretNumber: 0
   turretType: 1
   displayName: 
diff --git a/Assets/MyGame/aa/UI/Game/GameMainPanel_FishBase.cs b/Assets/MyGame/aa/UI/Game/GameMainPanel_FishBase.cs
index d80dceebe..73b9750fb 100644
--- a/Assets/MyGame/aa/UI/Game/GameMainPanel_FishBase.cs
+++ b/Assets/MyGame/aa/UI/Game/GameMainPanel_FishBase.cs
@@ -1290,6 +1290,10 @@ public class GameMainPanel_FishBase : GameMainPanel_Base
 
     private void RotateToLockTarget(SitPosData sit)
     {
+        // ⭐ 防御:锁定点为空或已被销毁(鱼死亡清锁/小白龙切模型销毁锚点)时直接跳过,
+        //   否则对空引用取 .position 会抛 NRE 中断整个 Update(锁定/开火/清锁全部卡死)
+        if (sit == null || sit.monCotl_Lock_Position == null) return;
+
         Vector2 screenPos = Camera.main.WorldToScreenPoint(sit.monCotl_Lock_Position.position);
 
         RectTransformUtility.ScreenPointToLocalPointInRectangle(
@@ -1443,6 +1447,10 @@ public class GameMainPanel_FishBase : GameMainPanel_Base
         //FireBullet(currSitData, angle, isSanShe, isDouble, isLock);
         SyncFire(angle, isSanShe, isDouble, isLock);
     }
+    /// <summary>战神激光命中延迟(秒)：不开实体子弹，开火后延迟此时间直接发 KillFish 给后端(模拟弹道飞行)</summary>
+    [Tooltip("战神激光命中延迟(秒)：不开实体子弹，开火后延迟此时间直接发 KillFish 给后端")]
+    public float laserHitDelay = 0.2f;
+
     private void FireBullet(SitPosData sit, float angle, bool isSanShe, bool isDouble, bool isLock, List<string> bullitIDs,
         List<string> fireTargetMonsterIDs = null, List<long> bulletGolds = null)
     {
@@ -1452,6 +1460,14 @@ public class GameMainPanel_FishBase : GameMainPanel_Base
             Debug.LogWarning("[FireBullet] sit 或 bullitIDs 为空,跳过本次开火");
             return;
         }
+
+        // ⭐ 战神激光模式(锁定中)：不创建实体子弹，延迟后直接发 KillFish 给后端
+        if (sit.currentZhanShenData != null && isLock)
+        {
+            FireLaser(sit, isDouble, isSanShe, bullitIDs, fireTargetMonsterIDs, bulletGolds);
+            return;
+        }
+
         Vector2 startPos = sit.GetBulletStartPos();
 
         // ⭐ 按索引取该发子弹的服务端权威扣费金额（bullets[i].gold），没有则回退到0（ConsumeGold内部用consumeGoldNum）
@@ -1523,6 +1539,100 @@ public class GameMainPanel_FishBase : GameMainPanel_Base
         }
     }
 
+    /// <summary>
+    /// 战神激光开火（锁定中）：不创建实体子弹（视觉就是 LineRenderer 激光线），
+    /// 每发按正常频率走 FireCannon/广播（频率不变），本地扣费后延迟 laserHitDelay 秒
+    /// 直接把 KillFish 发给后端结算（模拟弹道飞行时间）。
+    /// 目标：三发=锁定目标列表（与三条激光线一致），单发=主锁定目标。
+    /// </summary>
+    private void FireLaser(SitPosData sit, bool isDouble, bool isSanShe, List<string> bullitIDs,
+        List<string> fireTargetMonsterIDs, List<long> bulletGolds)
+    {
+        // ---- 收集激光目标（与激光线一一对应）----
+        var targets = new List<MonsterContral>();
+        if (isSanShe)
+        {
+            // 三发：优先用开火时随帧同步的目标 GUID
+            if (fireTargetMonsterIDs != null)
+            {
+                foreach (var guid in fireTargetMonsterIDs)
+                {
+                    if (CreateFishManager.Instance.fishDatas_hashCodekey.TryGetValue(guid, out var m)
+                        && m != null && !m.isDead && m.gameObject.activeInHierarchy)
+                        targets.Add(m);
+                }
+            }
+            // 兜底：座位上的三发锁定列表
+            if (targets.Count == 0)
+            {
+                foreach (var m in sit.tripleLockTargets)
+                    if (m != null && !m.isDead && m.gameObject.activeInHierarchy)
+                        targets.Add(m);
+            }
+        }
+        // 单发 / 三发兜底：主锁定目标
+        if (targets.Count == 0 && sit.monCotl_Lock != null
+            && !sit.monCotl_Lock.isDead && sit.monCotl_Lock.gameObject.activeInHierarchy)
+            targets.Add(sit.monCotl_Lock);
+
+        // ---- 每发：扣费 + 延迟发 KillFish（无目标也扣费，与子弹打空一致）----
+        for (int i = 0; i < bullitIDs.Count; i++)
+        {
+            long gold = bulletGolds != null && i < bulletGolds.Count ? bulletGolds[i] : 0;
+            if (!sit.ConsumeGold(isDouble ? 2 : 1, gold))
+                return;   // 没钱，后续不发
+
+            MonsterContral target = targets.Count > 0 ? targets[Mathf.Min(i, targets.Count - 1)] : null;
+            StartCoroutine(LaserHitRoutine(sit, target, bullitIDs[i]));
+        }
+
+        if (sit.posID == currSitData.posID)
+            AudioManager.Instance.PlayFX(bulletClip);
+    }
+
+    /// <summary>
+    /// 激光命中协程：延迟 laserHitDelay 后结算（不开实体子弹）。
+    /// 结算逻辑与 BullitMove.AttackFish 一致：本人发 KillFish、bot 由房主发 BotKillFish、本地播 OnHurt。
+    /// </summary>
+    private System.Collections.IEnumerator LaserHitRoutine(SitPosData sit, MonsterContral target, string bulletId)
+    {
+        if (laserHitDelay > 0f)
+            yield return new WaitForSeconds(laserHitDelay);
+        else
+            yield return null;
+
+        // 延迟期间目标死了/失效 → 本发打空（钱已扣，与子弹未命中一致）
+        if (target == null || target.isDead || !target.gameObject.activeInHierarchy)
+            yield break;
+
+        if (sit.user == GameManager.Instance.user.id)
+        {
+            // 真人玩家击杀：直接发后端
+            var v2 = GameManager.Instance.gameData.currRoomData;
+            WebSocketSendList.KillFish(v2.roomId, sit.user,
+                target.monsterData.fishTypeConfig.fishNumber, target.guid,
+                (int)sit.consumeGoldNum, bulletId, "63215f0afa3f5b25");
+        }
+        else if (!string.IsNullOrEmpty(sit.user) && sit.user.StartsWith("bot_"))
+        {
+            // 机器人击杀：只有房主客户端发送 BotKillFish
+            if (SitPosData.roomOwnerSit != null && SitPosData.roomOwnerSit.user == GameManager.Instance.user.id)
+            {
+                var v2 = GameManager.Instance.gameData.currRoomData;
+                WebSocketSendList.BotKillFish(
+                    v2.roomId,
+                    sit.user,
+                    target.monsterData.fishTypeConfig.fishNumber,
+                    target.guid,
+                    sit.consumeGoldNum,
+                    bulletId
+                );
+            }
+        }
+
+        target.OnHurt();
+    }
+
     private bool isLaser = false;
 
     private void StartLaser()