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

Assets/Art/HeroTimeLine/fb_yupingTimeline.playable

@@ -1,42 +1,5 @@
 %YAML 1.1
 %TAG !u! tag:yousandi.cn,2023:
---- !u!114 &-9185572214651843675
-MonoBehaviour:
-  m_ObjectHideFlags: 1
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 0}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: f1fc88ca9f5b46d2929d20f65fbe5c4e, type: 3}
-  m_Name: TimeLineParticleSystemAsset
-  m_EditorClassIdentifier: 
-  sourceGameObject:
-    exposedName: 510073d11a064b44b81d5efc39bc6cae
-    defaultValue: {fileID: 0}
-  prefabGameObject: {fileID: 0}
-  updateParticle: 1
-  particleRandomSeed: 2814
-  updateDirector: 1
-  updateITimeControl: 1
-  searchHierarchy: 0
-  active: 1
-  postPlayback: 2
-  targetType: 1
-  LocationType: 5
-  targetSpecialDotName: pengpos
-  hitPointGroupName: 
-  isGround: 0
-  isFollowTarget: 0
-  isNotRotate: 0
-  isFollowRootTarget: 0
-  isAttSpeed: 0
-  isLoop: 0
-  loopAlone: 0
-  isActivityCustomTargetPos: 0
-  CustomTargetPosIndex: 0
-  intervalTime: 0
 --- !u!114 &-9151128744060106284
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -266,76 +229,7 @@ MonoBehaviour:
   m_Curves: {fileID: 0}
   m_Parent: {fileID: 5132940870748184348}
   m_Children: []
-  m_Clips:
-  - m_Version: 1
-    m_Start: 0
-    m_ClipIn: 0
-    m_Asset: {fileID: -9185572214651843675}
-    m_Duration: 1
-    m_TimeScale: 1
-    m_ParentTrack: {fileID: -8734228703646629367}
-    m_EaseInDuration: 0
-    m_EaseOutDuration: 0
-    m_BlendInDuration: 0
-    m_BlendOutDuration: 0
-    m_MixInCurve:
-      serializedVersion: 2
-      m_Curve:
-      - serializedVersion: 3
-        time: 0
-        value: 0
-        inSlope: 0
-        outSlope: 0
-        tangentMode: 0
-        weightedMode: 0
-        inWeight: 0
-        outWeight: 0
-      - serializedVersion: 3
-        time: 1
-        value: 1
-        inSlope: 0
-        outSlope: 0
-        tangentMode: 0
-        weightedMode: 0
-        inWeight: 0
-        outWeight: 0
-      m_PreInfinity: 2
-      m_PostInfinity: 2
-      m_RotationOrder: 4
-    m_MixOutCurve:
-      serializedVersion: 2
-      m_Curve:
-      - serializedVersion: 3
-        time: 0
-        value: 1
-        inSlope: 0
-        outSlope: 0
-        tangentMode: 0
-        weightedMode: 0
-        inWeight: 0
-        outWeight: 0
-      - serializedVersion: 3
-        time: 1
-        value: 0
-        inSlope: 0
-        outSlope: 0
-        tangentMode: 0
-        weightedMode: 0
-        inWeight: 0
-        outWeight: 0
-      m_PreInfinity: 2
-      m_PostInfinity: 2
-      m_RotationOrder: 4
-    m_BlendInCurveMode: 0
-    m_BlendOutCurveMode: 0
-    m_ExposedParameterNames: []
-    m_AnimationCurves: {fileID: 0}
-    m_Recordable: 0
-    m_PostExtrapolationMode: 0
-    m_PreExtrapolationMode: 0
-    m_PostExtrapolationTime: 0
-    m_PreExtrapolationTime: 0
-    m_DisplayName: fx_fb_duipin_hit
+  m_Clips: []
   m_Markers:
     m_Objects: []
 --- !u!114 &-8034426028797582310
@@ -890,7 +784,7 @@ MonoBehaviour:
   searchHierarchy: 0
   active: 1
   postPlayback: 2
-  targetType: 2
+  targetType: 1
   LocationType: 6
   targetSpecialDotName: hitpos
   hitPointGroupName: 
@@ -1399,115 +1293,9 @@ MonoBehaviour:
   m_Curves: {fileID: 0}
   m_Parent: {fileID: 621060365187866526}
   m_Children: []
-  m_Clips:
-  - m_Version: 1
-    m_Start: 0
-    m_ClipIn: 0
-    m_Asset: {fileID: 4473300503793497422}
-    m_Duration: 1
-    m_TimeScale: 1
-    m_ParentTrack: {fileID: 4448712841006758773}
-    m_EaseInDuration: 0
-    m_EaseOutDuration: 0
-    m_BlendInDuration: 0
-    m_BlendOutDuration: 0
-    m_MixInCurve:
-      serializedVersion: 2
-      m_Curve:
-      - serializedVersion: 3
-        time: 0
-        value: 0
-        inSlope: 0
-        outSlope: 0
-        tangentMode: 0
-        weightedMode: 0
-        inWeight: 0
-        outWeight: 0
-      - serializedVersion: 3
-        time: 1
-        value: 1
-        inSlope: 0
-        outSlope: 0
-        tangentMode: 0
-        weightedMode: 0
-        inWeight: 0
-        outWeight: 0
-      m_PreInfinity: 2
-      m_PostInfinity: 2
-      m_RotationOrder: 4
-    m_MixOutCurve:
-      serializedVersion: 2
-      m_Curve:
-      - serializedVersion: 3
-        time: 0
-        value: 1
-        inSlope: 0
-        outSlope: 0
-        tangentMode: 0
-        weightedMode: 0
-        inWeight: 0
-        outWeight: 0
-      - serializedVersion: 3
-        time: 1
-        value: 0
-        inSlope: 0
-        outSlope: 0
-        tangentMode: 0
-        weightedMode: 0
-        inWeight: 0
-        outWeight: 0
-      m_PreInfinity: 2
-      m_PostInfinity: 2
-      m_RotationOrder: 4
-    m_BlendInCurveMode: 0
-    m_BlendOutCurveMode: 0
-    m_ExposedParameterNames: []
-    m_AnimationCurves: {fileID: 0}
-    m_Recordable: 0
-    m_PostExtrapolationMode: 0
-    m_PreExtrapolationMode: 0
-    m_PostExtrapolationTime: 0
-    m_PreExtrapolationTime: 0
-    m_DisplayName: fx_fb_duipin_hit
+  m_Clips: []
   m_Markers:
     m_Objects: []
---- !u!114 &4473300503793497422
-MonoBehaviour:
-  m_ObjectHideFlags: 1
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 0}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: f1fc88ca9f5b46d2929d20f65fbe5c4e, type: 3}
-  m_Name: TimeLineParticleSystemAsset(Clone)
-  m_EditorClassIdentifier: 
-  sourceGameObject:
-    exposedName: 8f4afe1992ed43640872dbaa60713fe9
-    defaultValue: {fileID: 0}
-  prefabGameObject: {fileID: 0}
-  updateParticle: 1
-  particleRandomSeed: 2814
-  updateDirector: 1
-  updateITimeControl: 1
-  searchHierarchy: 0
-  active: 1
-  postPlayback: 2
-  targetType: 1
-  LocationType: 5
-  targetSpecialDotName: pengpos
-  hitPointGroupName: 
-  isGround: 0
-  isFollowTarget: 0
-  isNotRotate: 0
-  isFollowRootTarget: 0
-  isAttSpeed: 0
-  isLoop: 0
-  loopAlone: 0
-  isActivityCustomTargetPos: 0
-  CustomTargetPosIndex: 0
-  intervalTime: 0
 --- !u!114 &5110619295240876175
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -1568,7 +1356,7 @@ MonoBehaviour:
   searchHierarchy: 0
   active: 1
   postPlayback: 2
-  targetType: 1
+  targetType: 2
   LocationType: 5
   targetSpecialDotName: hitpos
   hitPointGroupName: 

Assets/Res/AnimtionCurveLibrary/GameAnimationCurveLibrary.asset

@@ -82,3 +82,51 @@ MonoBehaviour:
     m_PreInfinity: 2
     m_PostInfinity: 2
     m_RotationOrder: 4
+  fabaoAtt:
+    serializedVersion: 2
+    m_Curve:
+    - serializedVersion: 3
+      time: 0
+      value: 0
+      inSlope: 0
+      outSlope: 0
+      tangentMode: 0
+      weightedMode: 0
+      inWeight: 0
+      outWeight: 0
+    - serializedVersion: 3
+      time: 1
+      value: 1
+      inSlope: 2
+      outSlope: 2
+      tangentMode: 0
+      weightedMode: 0
+      inWeight: 0
+      outWeight: 0
+    m_PreInfinity: 2
+    m_PostInfinity: 2
+    m_RotationOrder: 4
+  fabaoDuiPing:
+    serializedVersion: 2
+    m_Curve:
+    - serializedVersion: 3
+      time: 0
+      value: 0
+      inSlope: 0
+      outSlope: 0
+      tangentMode: 0
+      weightedMode: 0
+      inWeight: 0
+      outWeight: 0
+    - serializedVersion: 3
+      time: 1
+      value: 1
+      inSlope: 0
+      outSlope: 0
+      tangentMode: 0
+      weightedMode: 0
+      inWeight: 0
+      outWeight: 0
+    m_PreInfinity: 2
+    m_PostInfinity: 2
+    m_RotationOrder: 4

Assets/Res/Config/MagicWeaponConfig.json

@@ -6,36 +6,10 @@
       "magicAttribute": 1,
       "name": 5,
       "headicon": "icon_tx10001",
-      "model": "fb_wulonghuan",
-      "att": 100,
-      "skillID": [
-        91001
-      ],
-      "heroStory": null
-    },
-    {
-      "ID": 10002,
-      "nickName": -1,
-      "magicAttribute": 1,
-      "name": 5,
-      "headicon": "icon_tx10002",
-      "model": "fb_huohulu",
-      "att": 100,
-      "skillID": [
-        91002
-      ],
-      "heroStory": null
-    },
-    {
-      "ID": 10003,
-      "nickName": -1,
-      "magicAttribute": 1,
-      "name": 5,
-      "headicon": "icon_tx10003",
       "model": "fb_yuping",
       "att": 100,
       "skillID": [
-        91003
+        901001
       ],
       "heroStory": null
     }

Assets/Res/Config/SkillConfig.json

@@ -31,7 +31,7 @@
       ]
     },
     {
-      "ID": 90110011,
+      "ID": 9010011,
       "icon": "",
       "scriptName": "S901001",
       "IDGroup": 901001,
@@ -44,21 +44,6 @@
       "effectValue": [
         100.0
       ]
-    },
-    {
-      "ID": 90120011,
-      "icon": "",
-      "scriptName": "S901002",
-      "IDGroup": 901002,
-      "timelineName": "",
-      "cd": null,
-      "SkillType": 3,
-      "level": 1,
-      "name": null,
-      "desc": null,
-      "effectValue": [
-        100.0
-      ]
     }
   ]
 }

Assets/Res/HeroAnimtion/fb_yuping.asset

@@ -1,5 +1,33 @@
 %YAML 1.1
 %TAG !u! tag:yousandi.cn,2023:
+--- !u!114 &-6430102396614945439
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: c5a8877f26e7a6a43aaf06fade1a064a, type: 3}
+  m_Name: jiuo
+  m_EditorClassIdentifier: 
+  _Transition:
+    rid: 616298739367936000
+  references:
+    version: 2
+    RefIds:
+    - rid: 616298739367936000
+      type: {class: ClipTransition, ns: Animancer, asm: Kybernetik.Animancer}
+      data:
+        _FadeDuration: 0.25
+        _Speed: 1
+        _Events:
+          _NormalizedTimes: []
+          _Callbacks: []
+          _Names: []
+        _Clip: {fileID: 1827226128182048838, guid: f538b168f24934d46bd78e03404c196e, type: 3}
+        _NormalizedStartTime: NaN
 --- !u!114 &-5287561629531185777
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -44,6 +72,7 @@ MonoBehaviour:
     _Transitions:
     - {fileID: 5519247924259519141}
     - {fileID: -5287561629531185777}
+    - {fileID: -6430102396614945439}
     _Modifiers:
     - _From: 0
       _To: 0
@@ -57,6 +86,21 @@ MonoBehaviour:
     - _From: 1
       _To: 1
       _Fade: 0
+    - _From: 0
+      _To: 2
+      _Fade: 0
+    - _From: 1
+      _To: 2
+      _Fade: 0
+    - _From: 2
+      _To: 2
+      _Fade: 0
+    - _From: 2
+      _To: 1
+      _Fade: 0
+    - _From: 2
+      _To: 0
+      _Fade: 0
     _Aliases: []
     _AliasAllTransitions: 0
 --- !u!114 &5519247924259519141

Assets/Res/TimeLineAssets/fb_time_TD.txt.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: WiwYtS2qVyh8wIQTxlIQM5UDZx7sixJjXP/czpBUf8PvPvo+jUvSHgR3r80m
+guid: Dn5JtCyvBy6NGXkmGwXg2+A7C3OQBCx5E4U9uuK1ja8M2IVRic/MUJF6VdLL
 TextScriptImporter:
   externalObjects: {}
   userData: 

Assets/Scenes/testCombat.scene

@@ -162,6 +162,39 @@ Transform:
   m_CorrespondingSourceObject: {fileID: 3904968013911866960, guid: 1076536f8fdf47942aa287592c6a8b19, type: 3}
   m_PrefabInstance: {fileID: 293130736}
   m_PrefabAsset: {fileID: 0}
+--- !u!1 &101587813
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 101587814}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: GameObject
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &101587814
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 101587813}
+  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: 1612509952}
+  m_Father: {fileID: 611864970}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &111679905
 GameObject:
   m_ObjectHideFlags: 0
@@ -699,7 +732,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 6090200664286961698, guid: 1076536f8fdf47942aa287592c6a8b19, type: 3}
       propertyPath: myHeroInfo.Array.data[0].magicWeaponId.Array.data[0]
-      value: 10003
+      value: 10001
       objectReference: {fileID: 0}
     - target: {fileID: 6090200664286961698, guid: 1076536f8fdf47942aa287592c6a8b19, type: 3}
       propertyPath: myHeroInfo.Array.data[0].magicWeaponId.Array.data[1]
@@ -707,7 +740,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 6090200664286961698, guid: 1076536f8fdf47942aa287592c6a8b19, type: 3}
       propertyPath: enemyHeroInfo.Array.data[0].magicWeaponId.Array.data[0]
-      value: 10003
+      value: 10001
       objectReference: {fileID: 0}
     - target: {fileID: 6090200664286961698, guid: 1076536f8fdf47942aa287592c6a8b19, type: 3}
       propertyPath: enemyHeroInfo.Array.data[0].magicWeaponId.Array.data[1]
@@ -1255,6 +1288,66 @@ MonoBehaviour:
   m_Spacing: {x: 0, y: -50.3}
   m_Constraint: 0
   m_ConstraintCount: 2
+--- !u!1 &611864968
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 611864970}
+  - component: {fileID: 611864969}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: GameObject (1)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!114 &611864969
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 611864968}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 8b0bd7b63396499eacce1f4c28a706ea, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  Transforms:
+  - {fileID: 675361047}
+  - {fileID: 1858319898}
+  - {fileID: 1612509952}
+  - {fileID: 101587814}
+  BesselPath:
+    isActive: 0
+    controlPoints:
+    - {x: -3.442, y: 0, z: 9.89}
+    - {x: -15.332001, y: -0.29, z: 13.17}
+    - {x: 9.228001, y: -3.08, z: -3.56}
+    - {x: -3.442, y: 0, z: 0}
+  isRun: 0
+--- !u!4 &611864970
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 611864968}
+  serializedVersion: 2
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: -3.442, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children:
+  - {fileID: 101587814}
+  - {fileID: 675361047}
+  m_Father: {fileID: 0}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &612158946
 GameObject:
   m_ObjectHideFlags: 0
@@ -1281,12 +1374,45 @@ Transform:
   m_GameObject: {fileID: 612158946}
   serializedVersion: 2
   m_LocalRotation: {x: -0, y: -1, z: -0, w: 0}
-  m_LocalPosition: {x: -2.23, y: 0, z: 2.5900002}
+  m_LocalPosition: {x: 12.66, y: 1, z: -5}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 1469800233}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1 &675361046
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 675361047}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: GameObject (3)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &675361047
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 675361046}
+  serializedVersion: 2
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 9.89}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children:
+  - {fileID: 1858319898}
+  m_Father: {fileID: 611864970}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &753442135
 GameObject:
   m_ObjectHideFlags: 0
@@ -2044,14 +2170,14 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1469800232}
   serializedVersion: 2
-  m_LocalRotation: {x: 0, y: 1, z: 0, w: 0}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 9.89}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 612158947}
   m_Father: {fileID: 1902930422}
-  m_LocalEulerAnglesHint: {x: 0, y: 180, z: 0}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &1491951595
 GameObject:
   m_ObjectHideFlags: 0
@@ -2158,12 +2284,44 @@ Transform:
   m_GameObject: {fileID: 1515802677}
   serializedVersion: 2
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: -1.4949999, y: 1.615, z: 1}
+  m_LocalPosition: {x: -9.87, y: 4, z: 2}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 21371308}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1 &1612509951
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 1612509952}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: GameObject (1)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &1612509952
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1612509951}
+  serializedVersion: 2
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 12.67, y: -3.08, z: -3.56}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 101587814}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1001 &1663534286
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -2436,6 +2594,38 @@ MonoBehaviour:
   m_OnClick:
     m_PersistentCalls:
       m_Calls: []
+--- !u!1 &1858319897
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 1858319898}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: GameObject (2)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &1858319898
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1858319897}
+  serializedVersion: 2
+  m_LocalRotation: {x: -0, y: -1, z: -0, w: 0}
+  m_LocalPosition: {x: -11.89, y: -0.29, z: 3.28}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 675361047}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &1902930421
 GameObject:
   m_ObjectHideFlags: 0
@@ -2488,6 +2678,14 @@ MonoBehaviour:
   - {fileID: 1515802678}
   - {fileID: 612158947}
   - {fileID: 1469800233}
+  BesselPath:
+    isActive: 0
+    controlPoints:
+    - {x: -3.442, y: 0, z: 0}
+    - {x: -13.312, y: 4, z: 2}
+    - {x: 9.218, y: 1, z: 4.8900003}
+    - {x: -3.442, y: 0, z: 9.89}
+  isRun: 0
 --- !u!1001 &2101400848
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -4186,6 +4384,7 @@ SceneRoots:
   - {fileID: 5496476638347437383}
   - {fileID: 2101400848}
   - {fileID: 1902930422}
+  - {fileID: 611864970}
   - {fileID: 1663534286}
   - {fileID: 6794712585992138843}
   - {fileID: 4885491695541437786}

Assets/Scripts/Core/UI/UTool/CTween/AnimationCurveLibrary.cs

@@ -18,4 +18,6 @@ public class AnimationCurveLibrary : ScriptableObject
     // [Header("UI显示大小")] public AnimationCurve ui_showSize;
     [Header("UI移动大小")] public AnimationCurve ui_moveSize;
     [Header("UI移动速度")] public AnimationCurve ui_moveSpped;
+    [Header("法宝攻击速度曲线")] public AnimationCurve fabaoAtt;
+    [Header("法宝对拼速度曲线")] public AnimationCurve fabaoDuiPing;
 }

Assets/Scripts/Core/Utility/BesselPath.cs

@@ -4,12 +4,13 @@ using UnityEngine;
 
 namespace Core.Utility
 {
+    [System.Serializable]
     /// <summary>
     /// 贝塞尔曲线
     /// </summary>
-    public class BesselPath :CObject
+    public class BesselPath : CObject
     {
-        public BetterList<Vector3> controlPoints = new BetterList<Vector3>();
+        public List<Vector3> controlPoints = new List<Vector3>();
 
         public Vector3 CalculatePoint(float t)
         {
@@ -20,8 +21,13 @@ namespace Core.Utility
             }
 
             t = Mathf.Clamp01(t);
+            
+            // return controlPoints[0] * ((1 - t) * (1 - t) * (1 - t)) +
+            //        controlPoints[1] * (3 * t * (1 - t) * (1 - t)) +
+            //        controlPoints[2] * (3 * t * t * (1 - t)) +
+                   // controlPoints[3] * (t * t * t);
             int n = controlPoints.Count - 1; // 阶数
-
+            
             Vector3 point = Vector3.zero;
             for (int i = 0; i <= n; i++)
             {
@@ -29,6 +35,7 @@ namespace Core.Utility
                 float bernstein = Bernstein(n, i, t);
                 point += bernstein * controlPoints[i];
             }
+            
             return point;
         }
 
@@ -38,6 +45,32 @@ namespace Core.Utility
             return BinomialCoefficient(n, i) * Mathf.Pow(1 - t, n - i) * Mathf.Pow(t, i);
         }
 
+        public float GetLengthAtT(float t, int segments = 50)
+        {
+            if (controlPoints.Count < 2) return 0f;
+
+            t = Mathf.Clamp01(t);
+            float length = 0f;
+            Vector3 previousPoint = CalculatePoint(0);
+            float step = 1.0f / segments;
+
+            for (int i = 1; i <= segments; i++)
+            {
+                float currentT = i * step;
+                if (currentT < t)
+                {
+                    continue;
+                }
+
+
+                Vector3 currentPoint = CalculatePoint(currentT);
+                length += Vector3.Distance(previousPoint, currentPoint);
+                previousPoint = currentPoint;
+            }
+
+            return length;
+        }
+
         // 计算二项式系数 C(n,i)
         private float BinomialCoefficient(int n, int i)
         {
@@ -53,6 +86,7 @@ namespace Core.Utility
             {
                 result *= i;
             }
+
             return result;
         }
 
@@ -70,7 +104,6 @@ namespace Core.Utility
 
         public override void ActiveObj()
         {
-            
         }
 
         public override void DormancyObj()

Assets/Scripts/Core/Utility/BesselPathMono.cs

@@ -12,32 +12,37 @@ namespace Core.Utility
 
         public ACurve ACurve;
 
+        public bool isRun;
         private void OnDrawGizmos()
         {
+            
             if (BesselPath == null)
             {
                 BesselPath = new BesselPath();
             }
 
-            if (Transforms == null || Transforms.Length < 2)
+            if (!isRun)
             {
-                return;
+                if (Transforms == null || Transforms.Length < 2)
+                {
+                    return;
+                }
+
+                List<Vector3> pos = new List<Vector3>();
+                for (int i = 0; i < Transforms.Length; i++)
+                {
+                    pos.Add(Transforms[i].position);
+                }
+
+                BesselPath.controlPoints = (pos);
             }
 
-            BetterList<Vector3> pos = new BetterList<Vector3>();
-            for (int i = 0; i < Transforms.Length; i++)
-            {
-                pos.Add(Transforms[i].position);
-            }
-
-            BesselPath.controlPoints = (pos);
-
             Gizmos.color = Color.blue;
 
             // 绘制控制点
-            for (int i = 0; i < pos.Count; i++)
+            for (int i = 0; i <  BesselPath.controlPoints.Count; i++)
             {
-                Gizmos.DrawSphere(pos[i], 0.1f);
+                Gizmos.DrawSphere( BesselPath.controlPoints[i], 0.1f);
             }
 
             // 绘制曲线
@@ -48,6 +53,7 @@ namespace Core.Utility
             {
                 float t = i / (float)segments;
                 Vector3 currentPoint = BesselPath.CalculatePoint(t);
+                // Gizmos.DrawSphere(currentPoint, 0.03f);
                 Gizmos.DrawLine(previousPoint, currentPoint);
                 previousPoint = currentPoint;
             }

Assets/Scripts/GameLogic/Combat/CombatTool/CombatHeroController.cs

@@ -113,7 +113,7 @@ namespace GameLogic.Combat.CombatTool
             if (isSkillUp)
             {
                 // List<SkillConfig> skillConfigs = combatHeroInfo.skillConfigs;
-                combatHeroEntity.CombatHeroSkillControl.UpdateSkill(combatHeroInfo.unLockSkills);
+                combatHeroEntity.CombatHeroSkillControl.This<CombatHeroSkillControl>().UpdateSkill(combatHeroInfo.unLockSkills);
             }
         }
 

Assets/Scripts/GameLogic/Combat/CombatTool/MagicWeaponCollisionInfo.cs

@@ -1,15 +1,23 @@
+using Core.Triiger;
+using Core.Utility;
 using Fort23.Core;
 using Fort23.UTool;
 using GameLogic.Combat.Hero;
 using GameLogic.Combat.Hero.State;
+using UnityEngine;
+using Utility.CTween;
 
 namespace GameLogic.Combat.CombatTool
 {
-    public class MagicWeaponCollisionInfo : CObject
+    public class MagicWeaponCollisionInfo : CObject, ITriggerEntity
     {
         public CombatMagicWeaponEntity a;
         public CombatMagicWeaponEntity b;
 
+        public BesselPath _besselPathA;
+        public BesselPath _besselPathB;
+
+
         public int id;
         protected float _currTime;
 
@@ -18,9 +26,19 @@ namespace GameLogic.Combat.CombatTool
         /// </summary>
         public int State;
 
-        public void Init(CombatMagicWeaponEntity a, CombatMagicWeaponEntity b,int id)
+        private IUnRegister _unRegister;
+        protected bool _isOne;
+
+        protected ParticleSystemPool ParticleSystemPool;
+
+        public void Init(CombatMagicWeaponEntity a, CombatMagicWeaponEntity b, int id)
         {
             this.id = id;
+            if (a.IsEnemy)
+            {
+                (a, b) = (b, a);
+            }
+
             this.a = a;
             this.b = b;
             a.MagicWeaponCollisionId = id;
@@ -28,6 +46,57 @@ namespace GameLogic.Combat.CombatTool
             State = 0;
         }
 
+        private void OnTriggerEnter(Collider collider, ITriggerEntity triggerEntity)
+        {
+            HeroEntityMono heroEntityMono = collider.GetComponent<HeroEntityMono>();
+            if (heroEntityMono == null || (heroEntityMono.combatHeroEntity != b))
+            {
+                return;
+            }
+
+            if (State != 1)
+            {
+                return;
+            }
+
+            if ((a.HpBl <= 30 || b.HpBl < 20))
+            {
+                MagicWeaponPingDouState.MagicWeaponPingDouData rollingStateData =
+                    CObjectPool.Instance.Fetch<MagicWeaponPingDouState.MagicWeaponPingDouData>();
+                rollingStateData.target = b;
+
+                a.CombatAIBasic.ChangeState(CombatHeroStateType.MagicWeaponPingDou,
+                    rollingStateData);
+                MagicWeaponPingDouState.MagicWeaponPingDouData rollingStateData2 =
+                    CObjectPool.Instance.Fetch<MagicWeaponPingDouState.MagicWeaponPingDouData>();
+                rollingStateData.target = a;
+                b.CombatAIBasic.ChangeState(CombatHeroStateType.MagicWeaponPingDou,
+                    rollingStateData2);
+                State = 2;
+                _currTime = 0;
+                CombatController.currActiveCombat.GameTimeLineParticleFactory.CreateParticle("fx_fb_duipin_dian",
+                    a.dotPos, null, false, null, delegate(ParticleSystemPool particleSystemPool)
+                    {
+                        particleSystemPool.transform.rotation =
+                            a.GameObject.transform.rotation;
+                        ParticleSystemPool = particleSystemPool;
+                    });
+            }
+            else
+            {
+                CombatController.currActiveCombat.GameTimeLineParticleFactory.CreateParticle("fx_fb_duipin_hit",
+                    collider.transform.position, null, false, null, delegate(ParticleSystemPool particleSystemPool)
+                    {
+                        particleSystemPool.transform.rotation =
+                            a.GameObject.transform.rotation;
+                    });
+
+                a.ReduceHp(40);
+                // _trigger = true;
+                // _triggerTime = 0.5f;
+            }
+        }
+
         public void Update(float t)
         {
             if (State == 0)
@@ -36,10 +105,55 @@ namespace GameLogic.Combat.CombatTool
                     b.CombatAIBasic.stateControl.CurrStateName.Equals(CombatHeroStateType.idle))
                 {
                     State = 1;
+                    _besselPathA = new BesselPath();
+                    _besselPathA.controlPoints.Add(a.dotPos);
+                    _besselPathA.controlPoints.Add(a.GameObject.transform.TransformPoint(new Vector3(-9.87f, 4, 2)));
+
+                    _besselPathA.controlPoints.Add(b.GameObject.transform.TransformPoint(new Vector3(12.66f, 1, -5)));
+                    _besselPathA.controlPoints.Add(b.dotPos);
+                    GameObject G = new GameObject("BesselPathMono11");
+                    BesselPathMono besselPathMono = G.AddComponent<BesselPathMono>();
+                    besselPathMono.isRun = true;
+                    besselPathMono.BesselPath = _besselPathA;
+                    _besselPathB = new BesselPath();
+                    _besselPathB.controlPoints.Add(b.dotPos);
+                    _besselPathB.controlPoints.Add(
+                        b.GameObject.transform.TransformPoint(new Vector3(-11.89f, -0.29f, 3.28f)));
+
+                    _besselPathB.controlPoints.Add(
+                        a.GameObject.transform.TransformPoint(new Vector3(12.67f, -3.03f, -3.5f)));
+                    _besselPathB.controlPoints.Add(a.dotPos);
+                    GameObject G2 = new GameObject("BesselPathMono22");
+                    BesselPathMono besselPathMono2 = G2.AddComponent<BesselPathMono>();
+                    besselPathMono2.isRun = true;
+                    besselPathMono2.BesselPath = _besselPathB;
+
+                    _unRegister = a.GameObject.OnTriggerEnterEvent(this, OnTriggerEnter);
+                    _isOne = false;
+                    _currTime = 0;
                 }
             }
 
-            if (State == 2)
+            if (State == 1)
+            {
+                _currTime += t * 0.7f;
+               float v= CustomTweenManager.AnimationCurveLibrary.fabaoDuiPing.Evaluate(_currTime);
+                BesselPath besselPath = _isOne ? _besselPathB : _besselPathA;
+                Vector3 a1 = besselPath.CalculatePoint(v);
+                Vector3 a2 = besselPath.CalculatePoint(v - 0.01f);
+                Vector3 b1 = besselPath.CalculatePoint(1 - v);
+                Vector3 b2 = besselPath.CalculatePoint(1 - v + 0.01f);
+                a.combatHeroGameObject.SetPosition(a1);
+                a.GameObject.transform.rotation = Quaternion.LookRotation((a1 - a2).normalized);
+                b.combatHeroGameObject.SetPosition(b1);
+                b.GameObject.transform.rotation = Quaternion.LookRotation((b1 - b2).normalized);
+                if (_currTime >= 1)
+                {
+                    _currTime = 0;
+                    _isOne = !_isOne;
+                }
+            }
+            else if (State == 2)
             {
                 _currTime += t;
                 if (_currTime > 0.1f)
@@ -89,6 +203,11 @@ namespace GameLogic.Combat.CombatTool
                 a.MagicWeaponCollisionId = -1;
                 b.MagicWeaponCollisionId = -1;
             }
+
+            GObjectPool.Instance.Recycle(ParticleSystemPool);
+            ParticleSystemPool = null;
         }
+
+        public string tag { get; }
     }
 }

Assets/Scripts/GameLogic/Combat/CombatTool/MagicWeaponCombatSence.cs

@@ -146,6 +146,7 @@ namespace GameLogic.Combat.CombatTool
                 CombatMagicWeaponEntity target = nullTarget[index];
                 MagicWeaponCollisionInfo magicWeaponCollisionInfo =
                     CObjectPool.Instance.Fetch<MagicWeaponCollisionInfo>();
+                
                 magicWeaponCollisionInfo.Init(combatMagicWeaponEntity, target, MagicWeaponCollisionID);
                 magicWeaponCollisionInfoList.Add(MagicWeaponCollisionID, magicWeaponCollisionInfo);
                 MagicWeaponCollisionID++;
@@ -154,25 +155,7 @@ namespace GameLogic.Combat.CombatTool
             return;
         }
 
-        public void AddCollisionMagicWeapon(CombatMagicWeaponEntity a, CombatMagicWeaponEntity b)
-        {
-            MagicWeaponPingDouState.MagicWeaponPingDouData rollingStateData =
-                CObjectPool.Instance.Fetch<MagicWeaponPingDouState.MagicWeaponPingDouData>();
-            rollingStateData.target = b;
-
-            a.CombatAIBasic.ChangeState(CombatHeroStateType.MagicWeaponPingDou,
-                rollingStateData);
-            MagicWeaponPingDouState.MagicWeaponPingDouData rollingStateData2 =
-                CObjectPool.Instance.Fetch<MagicWeaponPingDouState.MagicWeaponPingDouData>();
-            rollingStateData.target = a;
-            b.CombatAIBasic.ChangeState(CombatHeroStateType.MagicWeaponPingDou,
-                rollingStateData2);
-            magicWeaponCollisionInfoList[a.MagicWeaponCollisionId].SetState(2);
-            // MagicWeaponCollisionInfo magicWeaponCollisionInfo = CObjectPool.Instance.Fetch<MagicWeaponCollisionInfo>();
-            // magicWeaponCollisionInfo.a = a;
-            // magicWeaponCollisionInfo.b = b;
-            // magicWeaponCollisionInfoList.Add(magicWeaponCollisionInfo);
-        }
+  
 
         public void RemoveCollisionMagicWeapon(int id)
         {

Assets/Scripts/GameLogic/Combat/CombatTool/SkillScriptManager.cs

@@ -6,7 +6,7 @@ using Utility;
 
 namespace GameLogic.Combat.CombatTool
 {
-    public class SkillScriptManager: Singleton<SkillScriptManager>
+    public class SkillScriptManager : Singleton<SkillScriptManager>
     {
         public static object ActivatorLoock = "lock";
 
@@ -20,28 +20,34 @@ namespace GameLogic.Combat.CombatTool
                     System.Type type = System.Type.GetType(typeName);
                     if (type == null)
                     {
-                        if (skillConfig.SkillType != 5&&skillConfig.SkillType!=6)
+                        typeName = "GameLogic.Combat.Skill.MagicSkill." + skillConfig.scriptName;
+                        type = System.Type.GetType(typeName);
+                        if (type == null)
                         {
-                            LogTool.Error("没有技能脚本" + typeName);
-                        }
+                            if (skillConfig.SkillType != 5 && skillConfig.SkillType != 6)
+                            {
+                                LogTool.Error("没有技能脚本" + typeName);
+                            }
 
-                        return null;
+                            return null;
+                        }
                     }
 
                     // SkillBasic 
-                    SkillBasic sb = (SkillBasic)CObjectPool.Instance.Fetch(type);;
+                    SkillBasic sb = (SkillBasic)CObjectPool.Instance.Fetch(type);
+                    ;
                     sb.InitSkillConfig(skillConfig);
                     return sb;
                 }
             }
             catch (System.Exception e)
             {
-                LogTool.Log(e+"错误技能" + skillConfig.scriptName);
+                LogTool.Log(e + "错误技能" + skillConfig.scriptName);
             }
 
             return null;
         }
-        
+
         // public SuitBasic CreateSkillBasic(RelicSuitConfig relicSuitConfig)
         // {
         //     try

Assets/Scripts/GameLogic/Combat/CombatType/TestCombatType.cs

@@ -84,7 +84,7 @@ namespace GameLogic.Combat.CombatType
                 // index %= nextConfig.monsterPoint.Length;
                 Vector3 pos =
                     CombatController.currActiveCombat.CombatSenceController.GetTarget(
-                        CombatController.currActiveCombat.CombatSenceController.currTime + 0.15f);
+                        CombatController.currActiveCombat.CombatSenceController.currTime + 0.15f)+new Vector3(0,1,0);
 
                 cTaskAwaitBuffer.AddTask(heroEntity.Init(new CombatHeroAi(), combatHeroInfo, pos,
                     delegate(CombatHeroEntity entity)

Assets/Scripts/GameLogic/Combat/Hero/CombatHeroEntity.cs

@@ -240,7 +240,12 @@ public class CombatHeroEntity : ShowBaiscEntity, ITimeLineAnimtion, ITimeLineGet
 
     public virtual float GetAttSpeed()
     {
-        return CombatHeroSkillControl.NormalAttSpeedScale;
+        CombatHeroSkillControl combatHeroSkillControl= CombatHeroSkillControl as CombatHeroSkillControl;
+        if (combatHeroSkillControl != null)
+        {
+            return combatHeroSkillControl.NormalAttSpeedScale;
+        }
+        return 1;
     }
 
     public void HeroResurrection()

Assets/Scripts/GameLogic/Combat/Hero/CombatHeroSkillControl.cs

@@ -11,10 +11,8 @@ using UnityEngine;
 
 namespace GameLogic.Combat.Hero
 {
-    public class CombatHeroSkillControl : IDisposable
+    public class CombatHeroSkillControl : CombatHeroSkillControlBasic
     {
-        private BetterList<SkillBasic> allSkill = new BetterList<SkillBasic>();
-
         /// <summary>
         /// 技能指令，0表示没有技能；
         /// </summary>
@@ -25,28 +23,23 @@ namespace GameLogic.Combat.Hero
         /// </summary>
         public SkillBasic currUseSkill;
 
-        private CombatHeroEntity _combatHeroEntity;
 
 
-       
 
         public float NormalAttSpeedScale;
 
-        /// <summary>
-        /// 当前显示跑CD的技能
-        /// </summary>
-        public SkillBasic currCdSkill;
+  
 
         private BetterList<SkillBasic> _skillQueue = new BetterList<SkillBasic>();
 
         // private BetterList<SkillBasic> _skillQueue = new BetterList<SkillBasic>();
         private int _currUseQueueIndex = 0;
 
-        public async CTask Init(CombatHeroEntity combatHeroEntity)
+        protected override async CTask ProInit()
         {
             NormalAttSpeedScale = 2;
             CTaskAwaitBuffer cTaskAwaitBuffer = new CTaskAwaitBuffer();
-            _combatHeroEntity = combatHeroEntity;
+
             List<int> skillId = _combatHeroEntity.CurrCombatHeroInfo.unLockSkills;
             if (skillId != null)
             {
@@ -72,7 +65,7 @@ namespace GameLogic.Combat.Hero
                                     TimeLienData timeLienData = JsonManager.FromJson<TimeLienData>(textAsset.text);
                                     timeLienData.DeserializeData();
                                     handle.Release();
-                                    combatHeroEntity.combatHeroTimeLineControl.AddTimeLienData(timeLienData);
+                                    _combatHeroEntity.combatHeroTimeLineControl.AddTimeLienData(timeLienData);
                                 }
                             }));
                     }
@@ -102,36 +95,6 @@ namespace GameLogic.Combat.Hero
             }
         }
 
-        public SkillBasic GetSkillBasic(int skillGroupId)
-        {
-            for (int i = 0; i < allSkill.Count; i++)
-            {
-                if (allSkill[i].SelfSkillConfig.IDGroup == skillGroupId)
-                {
-                    return allSkill[i];
-                }
-            }
-
-            return null;
-        }
-
-        public SkillBasic AddSkill(SkillConfig skillConfig)
-        {
-            if (string.IsNullOrEmpty(skillConfig.scriptName))
-            {
-                return null;
-            }
-
-            SkillBasic skillBasic = SkillScriptManager.Instance.CreateSkillBasic(skillConfig);
-            if (skillBasic == null)
-            {
-                return null;
-            }
-
-            skillBasic.InitSkill(_combatHeroEntity);
-            allSkill.Add(skillBasic);
-            return skillBasic;
-        }
 
         public void AddCommandSkill(SkillBasic skill)
         {
@@ -189,7 +152,6 @@ namespace GameLogic.Combat.Hero
 
         public void StartPolling()
         {
-         
             for (int i = 0; i < _skillQueue.size; i++)
             {
                 SkillBasic skillBasic = allSkill[i];
@@ -205,7 +167,7 @@ namespace GameLogic.Combat.Hero
             _currUseQueueIndex = 0;
         }
 
-        public void Update(float t)
+        protected override void ProUpdate(float t)
         {
             if (currUseSkill == null && SkillCommands.Count <= 0)
             {
@@ -228,9 +190,9 @@ namespace GameLogic.Combat.Hero
             {
                 StartPolling();
             }
-            
         }
 
+
         public void SetNormalAttCd()
         {
             // if (NormalAttack == null)
@@ -254,14 +216,14 @@ namespace GameLogic.Combat.Hero
             // NormalAttCd = cd;
         }
 
-        public void Dispose()
+        public virtual void Dispose()
         {
             _combatHeroEntity = null;
 
             currUseSkill = null;
         }
 
-        public void ProDormancyObj()
+        public virtual void ProDormancyObj()
         {
             for (int i = 0; i < allSkill.size; i++)
             {

Assets/Scripts/GameLogic/Combat/Hero/CombatHeroSkillControlBasic.cs

@@ -0,0 +1,105 @@
+using System;
+using System.Collections.Generic;
+using Common.Utility.CombatEvent;
+using Excel2Json;
+using Fort23.Core;
+using Fort23.UTool;
+using GameLogic.Combat.CombatTool;
+using GameLogic.Combat.Skill;
+using UnityEngine;
+
+namespace GameLogic.Combat.Hero
+{
+    public class CombatHeroSkillControlBasic : IDisposable
+    {
+        public BetterList<SkillBasic> allSkill = new BetterList<SkillBasic>();
+
+
+        protected CombatHeroEntity _combatHeroEntity;
+
+
+        /// <summary>
+        /// 当前显示跑CD的技能
+        /// </summary>
+        public SkillBasic currCdSkill;
+
+        public T This<T>() where T : class
+        {
+            return this as T;
+        }
+
+        public async CTask Init(CombatHeroEntity combatHeroEntity)
+        {
+            _combatHeroEntity = combatHeroEntity;
+            await ProInit();
+        }
+
+        protected virtual async CTask ProInit()
+        {
+        }
+
+
+        public SkillBasic GetSkillBasic(int skillGroupId)
+        {
+            for (int i = 0; i < allSkill.Count; i++)
+            {
+                if (allSkill[i].SelfSkillConfig.IDGroup == skillGroupId)
+                {
+                    return allSkill[i];
+                }
+            }
+
+            return null;
+        }
+
+        public SkillBasic AddSkill(SkillConfig skillConfig)
+        {
+            if (string.IsNullOrEmpty(skillConfig.scriptName))
+            {
+                return null;
+            }
+
+            SkillBasic skillBasic = SkillScriptManager.Instance.CreateSkillBasic(skillConfig);
+            if (skillBasic == null)
+            {
+                return null;
+            }
+
+           
+            skillBasic.InitSkill(_combatHeroEntity);
+            allSkill.Add(skillBasic);
+            return skillBasic;
+        }
+
+
+        public void Update(float t)
+        {
+            for (int i = 0; i < allSkill.Count; i++)
+            {
+                allSkill[i].CombatUpdate(t);
+            }
+
+            ProUpdate(t);
+        }
+
+        protected virtual void ProUpdate(float t)
+        {
+        }
+
+        public virtual void Dispose()
+        {
+            _combatHeroEntity = null;
+        }
+
+        public virtual void ProDormancyObj()
+        {
+            for (int i = 0; i < allSkill.size; i++)
+            {
+                SkillBasic skillBasic = allSkill[i];
+                CObjectPool.Instance.Recycle(skillBasic);
+            }
+
+            allSkill.Clear();
+        }
+    }
+}

Assets/Scripts/GameLogic/Combat/Hero/CombatHeroSkillControlBasic.cs.meta

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 3fce874957ed48b5ba297aec89a6e7ee
+timeCreated: 1742527047

Assets/Scripts/GameLogic/Combat/Hero/CombatMagicWeaponEntity.cs

@@ -6,6 +6,7 @@ using Fort23.UTool;
 using GameLogic.Combat.Buff;
 using GameLogic.Combat.CombatTool;
 using GameLogic.Combat.Hero.State;
+using GameLogic.Combat.Skill;
 using UnityEngine;
 using UnityEngine.AI;
 
@@ -16,17 +17,16 @@ namespace GameLogic.Combat.Hero
     /// </summary>
     public class CombatMagicWeaponEntity : CombatHeroEntity
     {
-         
         /// <summary>
         /// 碰撞的target
         /// </summary>
         public CombatMagicWeaponEntity CollidingTarget;
 
-        public int MagicWeaponCollisionId=-1;
+        public int MagicWeaponCollisionId = -1;
         protected MagicWeaponConfig _magicWeaponConfig;
         public float cd = 2;
 
-        
+
         public float HpBl
         {
             get { return _HpBl; }
@@ -35,6 +35,7 @@ namespace GameLogic.Combat.Hero
         private float _HpBl = 100;
 
         public int useIndex;
+
         /// <summary>
         /// 是否进入战斗状态
         /// </summary>
@@ -47,6 +48,8 @@ namespace GameLogic.Combat.Hero
             get { return _magicWeaponControl; }
         }
 
+        private BetterList<SkillBasic> allSkill = new BetterList<SkillBasic>();
+
         public void ReduceHp(float value)
         {
             _HpBl -= value;
@@ -57,7 +60,7 @@ namespace GameLogic.Combat.Hero
                 CombatEventManager.Instance.Dispatch(CombatEventType.MagicWeaponDie,
                     heroDieEventData);
                 cd = 10;
-                CombatAIBasic.ChangeState(CombatHeroStateType.XiuMian);
+                CombatAIBasic.ChangeState(CombatHeroStateType.dile);
             }
         }
 
@@ -98,6 +101,17 @@ namespace GameLogic.Combat.Hero
 
             combatHeroGameObject = new CombatHeroGameObject();
             combatHeroGameObject.Init(this, poolInterface);
+            CombatHeroSkillControl = new CombatHeroSkillControlBasic();
+            CombatHeroSkillControl.Init(this);
+            if (magicWeaponConfig.skillID != null)
+            {
+                for (int i = 0; i < magicWeaponConfig.skillID.Length; i++)
+                {
+                    int id = magicWeaponConfig.skillID[i] * 10 + 1;
+                    SkillConfig skillConfig = ConfigComponent.Instance.Get<SkillConfig>(id);
+                    CombatHeroSkillControl.AddSkill(skillConfig);
+                }
+            }
 
 
             if (CombatAIBasic == null)
@@ -136,11 +150,12 @@ namespace GameLogic.Combat.Hero
         {
             combatHeroTimeLineControl.Update(t);
             CombatAIBasic?.Update(t);
+            CombatHeroSkillControl?.Update(t);
             if (CombatAIBasic.CurrState.GetType() == typeof(MagicWeapomDormancyState))
             {
                 cd -= t;
-             
-                if (cd <= 0&&_magicWeaponControl.combatHeroEntity.CombatAIBasic.currFocusTarget != null)
+
+                if (cd <= 0 && _magicWeaponControl.combatHeroEntity.CombatAIBasic.currFocusTarget != null)
                 {
                     _HpBl = 100;
                     CollidingTarget = null;

Assets/Scripts/GameLogic/Combat/Hero/MagicWeaponAi.cs

@@ -14,10 +14,11 @@ namespace GameLogic.Combat.Hero
 
             stateControl.AddState(CombatHeroStateType.idle, new MagicWeaponIdleState(_showBaiscEntity));
             stateControl.AddState(CombatHeroStateType.move, new MagicWeaponMoveState(_showBaiscEntity));
-            stateControl.AddState(CombatHeroStateType.MagicWeaponPingDou, new MagicWeaponPingDouState(_showBaiscEntity));
+            stateControl.AddState(CombatHeroStateType.MagicWeaponPingDou,
+                new MagicWeaponPingDouState(_showBaiscEntity));
             stateControl.AddState(CombatHeroStateType.Active, new MagicWeaponChuChangState(_showBaiscEntity));
             stateControl.AddState(CombatHeroStateType.att, new MagicWeaponAttState(_showBaiscEntity));
-            
+            stateControl.AddState(CombatHeroStateType.dile, new MagicWeaponDieState(_showBaiscEntity));
         }
 
         protected override void ProUpdate()
@@ -30,7 +31,8 @@ namespace GameLogic.Combat.Hero
             if (rootRoat != null)
             {
                 rootRoat.localEulerAngles =
-                    new Vector3(rootRoat.localEulerAngles.x ,rootRoat.localEulerAngles.y, rootRoat.localEulerAngles.z + roatSpeed);
+                    new Vector3(rootRoat.localEulerAngles.x, rootRoat.localEulerAngles.y,
+                        rootRoat.localEulerAngles.z + roatSpeed);
             }
         }
     }

Assets/Scripts/GameLogic/Combat/Hero/ShowBaiscEntity.cs

@@ -18,7 +18,7 @@ namespace GameLogic.Combat.Hero
         public CombatHeroGameObject combatHeroGameObject;
         public CombatHeroTimeLineControl combatHeroTimeLineControl;
         public HeroAnimtionBasic combatHeroAnimtion;
-        public CombatHeroSkillControl CombatHeroSkillControl;
+        public CombatHeroSkillControlBasic CombatHeroSkillControl;
 
         public BuffControl BuffControl;
         public BetterList<CombatParticleSystemPool> heroLoopParticle = new BetterList<CombatParticleSystemPool>();

Assets/Scripts/GameLogic/Combat/Hero/State/CombatHeroAttState.cs

@@ -18,7 +18,7 @@ namespace GameLogic.Combat.Hero.State
 
         protected override void ProEnter()
         {
-            skillBasic = combatHeroEntity.CombatHeroSkillControl.CanReleaseSkill();
+            skillBasic = combatHeroEntity.CombatHeroSkillControl.This<CombatHeroSkillControl>().CanReleaseSkill();
             if (skillBasic == null)
             {
                 combatHeroEntity.CombatAIBasic.ChangeState(CombatHeroStateType.idle);
@@ -37,8 +37,8 @@ namespace GameLogic.Combat.Hero.State
                     LogTool.Log("其他技能结束");
                 }
             });
-            combatHeroEntity.CombatHeroSkillControl.RemoveCommandSkill(skillBasic);
-            combatHeroEntity.CombatHeroSkillControl.UseSkill(skillBasic);
+            combatHeroEntity.CombatHeroSkillControl.This<CombatHeroSkillControl>().RemoveCommandSkill(skillBasic);
+            combatHeroEntity.CombatHeroSkillControl.This<CombatHeroSkillControl>().UseSkill(skillBasic);
         }
 
         protected override void ProExit()
@@ -49,7 +49,7 @@ namespace GameLogic.Combat.Hero.State
             }
 
           
-            combatHeroEntity.CombatHeroSkillControl.currUseSkill = null;
+            combatHeroEntity.CombatHeroSkillControl.This<CombatHeroSkillControl>().currUseSkill = null;
             skillBasic = null;
         }
     }

Assets/Scripts/GameLogic/Combat/Hero/State/CombatHeroIdleState.cs

@@ -30,7 +30,7 @@ namespace GameLogic.Combat.Hero.State
                 combatHeroEntity.CombatAIBasic.AddSubStatus(FightIdleSubState);
             }
 
-            if (combatHeroEntity.CombatHeroSkillControl.CanReleaseSkill() != null)
+            if (combatHeroEntity.CombatHeroSkillControl.This<CombatHeroSkillControl>().CanReleaseSkill() != null)
             {
                 combatHeroEntity.CombatAIBasic.ChangeState(CombatHeroStateType.att);
             }

Assets/Scripts/GameLogic/Combat/Hero/State/MagicWeaponAttState.cs

@@ -1,6 +1,7 @@
 using Common.Utility.CombatEvent;
 using Core.Utility;
 using Fort23.Core;
+using GameLogic.Combat.Skill;
 using UnityEngine;
 
 namespace GameLogic.Combat.Hero.State
@@ -9,7 +10,6 @@ namespace GameLogic.Combat.Hero.State
     {
         private CombatMagicWeaponEntity myCombatMagicWeaponEntity;
 
-        private BesselPath _besselPath;
 
         public MagicWeaponAttState(CombatHeroEntity combatHeroEntity) : base(combatHeroEntity)
         {
@@ -21,10 +21,25 @@ namespace GameLogic.Combat.Hero.State
         /// </summary>
         protected override void ProEnter()
         {
-            _besselPath = CObjectPool.Instance.Fetch<BesselPath>();
-            myCombatMagicWeaponEntity.GameObject.transform.eulerAngles = Vector3.zero;
-            Vector3 p1 = myCombatMagicWeaponEntity.GameObject.transform.TransformVector(new Vector3(-1.5f, 1.7f, 1));
-            
+            if (myCombatMagicWeaponEntity.CombatHeroSkillControl.allSkill.Count <= 0)
+            {
+                Finish();
+                return;
+            }
+
+            SkillBasic skillBasic = myCombatMagicWeaponEntity.CombatHeroSkillControl.allSkill[0];
+            if (skillBasic == null)
+            {
+                Finish();
+                return;
+            }
+
+            skillBasic.SetSkillFinishCallBack(delegate(SkillBasic sb) { Finish(); });
+            skillBasic.UseSkill();
+        }
+
+        private void Finish()
+        {
             HeroDieEventData heroDieEventData = HeroDieEventData.Create();
             heroDieEventData.combatHeroEntity = myCombatMagicWeaponEntity;
             CombatEventManager.Instance.Dispatch(CombatEventType.MagicWeaponDie,
@@ -35,12 +50,10 @@ namespace GameLogic.Combat.Hero.State
 
         private void SetTargetPos()
         {
-            
         }
 
         protected override void ProExit()
         {
-            CObjectPool.Instance.Recycle(_besselPath);
         }
     }
 }

Assets/Scripts/GameLogic/Combat/Hero/State/MagicWeaponChuChangState.cs

@@ -15,6 +15,7 @@ namespace GameLogic.Combat.Hero.State
         private float _currTime;
         private TimeLineEventLogicGroupBasic timeLineEventLogicGroup;
 
+        private bool isUpdate;
         public MagicWeaponChuChangState(CombatHeroEntity combatHeroEntity) : base(combatHeroEntity)
         {
             myCombatMagicWeaponEntity = combatHeroEntity as CombatMagicWeaponEntity;
@@ -25,7 +26,7 @@ namespace GameLogic.Combat.Hero.State
             timeLineEventLogicGroup =
                 combatHeroEntity.combatHeroTimeLineControl.AddEventLogicGroup("jihuo");
 
-
+            myCombatMagicWeaponEntity.GameObject.transform.eulerAngles = Vector3.zero;
             myCombatMagicWeaponEntity.GameObject.SetActive(true);
             startPos = myCombatMagicWeaponEntity.MagicWeaponControl.combatHeroEntity.dotPos;
             float y = myCombatMagicWeaponEntity.IsEnemy ? 5 : 3;
@@ -35,16 +36,23 @@ namespace GameLogic.Combat.Hero.State
             endPos = startPos + new Vector3(x, y, 0);
             _addTime = 1.0f / (Vector3.Distance(startPos, endPos) / 3);
             _currTime = 0;
+            isUpdate = true;
         }
 
 
         protected override void ProUpdate(float t)
         {
+            if (!isUpdate)
+            {
+                return;
+            }
+
             _currTime += t * _addTime;
             Vector3 pos = Vector3.Lerp(startPos, endPos, _currTime);
             myCombatMagicWeaponEntity.combatHeroGameObject.SetPosition(pos);
             if (_currTime >= 1)
             {
+                isUpdate = false;
                 if (timeLineEventLogicGroup != null)
                 {
                     timeLineEventLogicGroup.CloseLoopFx();

Assets/Scripts/GameLogic/Combat/Hero/State/MagicWeaponDieState.cs

@@ -0,0 +1,29 @@
+using CombatLibrary.CombatLibrary.CombatCore.CustomizeTimeLogic.FxLogic;
+
+namespace GameLogic.Combat.Hero.State
+{
+    public class MagicWeaponDieState: CombatHeroStateBasic
+    {
+        public MagicWeaponDieState(CombatHeroEntity combatHeroEntity) : base(combatHeroEntity)
+        {
+        }
+
+        protected override void ProEnter()
+        {
+            combatHeroEntity.GameObject.SetActive(false);
+            TimeLineEventLogicGroupBasic    timeLineEventLogicGroup =
+                combatHeroEntity.combatHeroTimeLineControl.AddEventLogicGroup("die");
+            if (timeLineEventLogicGroup != null)
+            {
+                timeLineEventLogicGroup.TimeLineUpdateEnd = delegate()
+                {
+                    combatHeroEntity.CombatAIBasic.ChangeState(CombatHeroStateType.XiuMian);
+                };
+            }
+            else
+            {
+                combatHeroEntity.CombatAIBasic.ChangeState(CombatHeroStateType.XiuMian);
+            }
+        }
+    }
+}

Assets/Scripts/GameLogic/Combat/Hero/State/MagicWeaponDieState.cs.meta

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: fd8f67c034ac4daa94e9ce0de6aeaa9c
+timeCreated: 1742549771

Assets/Scripts/GameLogic/Combat/Hero/State/MagicWeaponIdleState.cs

@@ -46,10 +46,10 @@ namespace GameLogic.Combat.Hero
                         myCombatMagicWeaponEntity.GameObject.transform.rotation,
                         newQuaternion, 5);
                 }
-                else
-                {
-                    myCombatMagicWeaponEntity.CombatAIBasic.ChangeState(CombatHeroStateType.move);
-                }
+                // else
+                // {
+                //     myCombatMagicWeaponEntity.CombatAIBasic.ChangeState(CombatHeroStateType.move);
+                // }
 
                 return;
             }

Assets/Scripts/GameLogic/Combat/Hero/State/MagicWeaponMoveState.cs

@@ -11,7 +11,7 @@ namespace GameLogic.Combat.Hero.State
     /// <summary>
     /// 再空中飞来飞去撞的时候
     /// </summary>
-    public class MagicWeaponMoveState : CombatHeroStateBasic,ITriggerEntity
+    public class MagicWeaponMoveState : CombatHeroStateBasic
     {
         public class MagicWeaponMoveStateData : CObject, IStateEnterData
         {
@@ -45,25 +45,11 @@ namespace GameLogic.Combat.Hero.State
 
         protected override void ProEnter()
         {
-            MagicWeaponMoveStateData magicWeaponMoveStateData = iStateEnterData as MagicWeaponMoveStateData;
-            if (magicWeaponMoveStateData != null)
-            {
-                _trigger = magicWeaponMoveStateData.trigger;
-                _triggerTime = magicWeaponMoveStateData.triggerTime;
-            }
-
-            OnTriggerEnterEvent = myCombatMagicWeaponEntity.GameObject.OnTriggerEnterEvent(this,OnTriggerEnter);
+ 
+            
         }
 
-        public Vector3 GetStartPos()
-        {
-            Vector3 startPos = myCombatMagicWeaponEntity.MagicWeaponControl.combatHeroEntity.dotPos;
-            float y = myCombatMagicWeaponEntity.IsEnemy ? 5 : 3;
-            float x = myCombatMagicWeaponEntity.useIndex;
-
-
-            return startPos + new Vector3(x, y, 0);
-        }
+ 
 
         private void OnTriggerEnter(Collider collider,ITriggerEntity triggerEntity)
         {
@@ -78,109 +64,11 @@ namespace GameLogic.Combat.Hero.State
                 return;
             }
 
-            CombatMagicWeaponEntity combatMagicWeaponEntity =
-                heroEntityMono.combatHeroEntity as CombatMagicWeaponEntity;
-            if ((combatMagicWeaponEntity.HpBl <= 30 || myCombatMagicWeaponEntity.HpBl < 20) &&
-                myCombatMagicWeaponEntity.CombatAIBasic.CurrState is MagicWeaponMoveState)
-            {
-                CombatController.currActiveCombat.MagicWeaponCombatSence.AddCollisionMagicWeapon(
-                    combatMagicWeaponEntity, myCombatMagicWeaponEntity);
-            }
-            else
-            {
-                if (!myCombatMagicWeaponEntity.IsEnemy)
-                {
-                    CombatController.currActiveCombat.GameTimeLineParticleFactory.CreateParticle("fx_爆",
-                        collider.transform.position, null, false, null, delegate(ParticleSystemPool particleSystemPool)
-                        {
-                            particleSystemPool.transform.rotation =
-                                myCombatMagicWeaponEntity.GameObject.transform.rotation;
-                        });
-                }
-
-                combatMagicWeaponEntity.ReduceHp(40);
-                _trigger = true;
-                _triggerTime = 0.5f;
-                myCombatMagicWeaponEntity.CollidingTarget = null;
-            }
-
-            // _trigger = true;
-            // _triggerTime = 0.5f;
-            //碰到了要撞的敌人
+        
+            
         }
 
-        protected override void ProUpdate(float t)
-        {
-            if (myCombatMagicWeaponEntity.CollidingTarget == null ||
-                myCombatMagicWeaponEntity.CollidingTarget.HpBl <= 0)
-            {
-                // myCombatMagicWeaponEntity.CollidingTarget = combatMagicWeaponEntity;
-            }
-
-            MagicWeaponCollisionInfo nMagicWeaponCollisionInfo =
-                CombatController.currActiveCombat.MagicWeaponCombatSence.FindMagicWeaponCollisionInfo(
-                    myCombatMagicWeaponEntity.MagicWeaponCollisionId);
-            myCombatMagicWeaponEntity.CollidingTarget =
-                nMagicWeaponCollisionInfo.a == combatHeroEntity
-                    ? nMagicWeaponCollisionInfo.b
-                    : nMagicWeaponCollisionInfo.a;
-            Vector3 targetPos = Vector3.zero;
-            CombatMagicWeaponEntity currCollidingTarget = myCombatMagicWeaponEntity.CollidingTarget;
-            if (currCollidingTarget == null || !currCollidingTarget.isCombatState) //没有可碰撞的法宝了
-            {
-                Vector3 startPos = GetStartPos();
-                if (Vector3.Distance(startPos, myCombatMagicWeaponEntity.dotPos) < 0.5f)
-                {
-                    myCombatMagicWeaponEntity.CombatAIBasic.ChangeState(CombatHeroStateType.idle);
-                    return;
-                }
-
-                targetPos = startPos;
-            }
-            else
-            {
-                targetPos = currCollidingTarget.dotPos;
-            }
-
-
-            Quaternion newQuaternion = myCombatMagicWeaponEntity.GameObject.transform.rotation;
-            if (_trigger && _triggerTime > 0)
-            {
-                _triggerTime -= t;
-                if (_triggerTime <= 0)
-                {
-                    _trigger = false;
-                    // speed = 1;
-                }
-            }
-            else
-            {
-                Vector3 newDir = (targetPos - myCombatMagicWeaponEntity.dotPos).normalized;
-                float targetAngle = Vector3.Angle(Vector3.forward, newDir);
-                // Quaternion.Euler(0, targetAngle, 0) * enemyDirection;
-                newQuaternion = Quaternion.LookRotation(newDir);
-
-
-                newQuaternion = Quaternion.RotateTowards(myCombatMagicWeaponEntity.GameObject.transform.rotation,
-                    newQuaternion, 5);
-
-                _lastDir = newDir;
-            }
-
-            // speed += t * 3;
-            // if (speed > 10)
-            // {
-            //     speed = 10;
-            // }
-
-            Vector3 pos = newQuaternion * new Vector3(0, 0, 1);
-            Vector3 movePos = pos * speed * t;
-
-            Vector3 _currPos = myCombatMagicWeaponEntity.dotPos;
-            _currPos += movePos;
-            myCombatMagicWeaponEntity.combatHeroGameObject.SetPosition(_currPos);
-            myCombatMagicWeaponEntity.GameObject.transform.rotation = newQuaternion;
-        }
+   
 
 
         protected void ActiveHero()

Assets/Scripts/GameLogic/Combat/Hero/State/MagicWeaponPingDouState.cs

@@ -1,3 +1,4 @@
+using CombatLibrary.CombatLibrary.CombatCore.CustomizeTimeLogic.FxLogic;
 using Core.State;
 using Fort23.Core;
 using Fort23.UTool;
@@ -31,8 +32,9 @@ namespace GameLogic.Combat.Hero.State
 
         private MagicWeaponPingDouData _magicWeaponPingDouData;
 
-        private ParticleSystemPool _particleSystemPool1;
+     
         private ParticleSystemPool _particleSystemPool2;
+        private TimeLineEventLogicGroupBasic timeLineEventLogicGroup;
         public MagicWeaponPingDouState(CombatHeroEntity combatHeroEntity) : base(combatHeroEntity)
         {
             myCombatMagicWeaponEntity = combatHeroEntity as CombatMagicWeaponEntity;
@@ -40,20 +42,18 @@ namespace GameLogic.Combat.Hero.State
 
         protected override void ProEnter()
         {
-            CombatController.currActiveCombat.GameTimeLineParticleFactory.CreateParticle("fx_对拼气罩_loop",
-                myCombatMagicWeaponEntity.dotPos, null, false, null, delegate(ParticleSystemPool particleSystemPool)
-                {
-                    particleSystemPool.transform.rotation =
-                        myCombatMagicWeaponEntity.GameObject.transform.rotation;
-                    _particleSystemPool1= particleSystemPool;
-                });
-            CombatController.currActiveCombat.GameTimeLineParticleFactory.CreateParticle("fx_对拼点",
-                myCombatMagicWeaponEntity.dotPos, null, false, null, delegate(ParticleSystemPool particleSystemPool)
-                {
-                    particleSystemPool.transform.rotation =
-                        myCombatMagicWeaponEntity.GameObject.transform.rotation;
-                    _particleSystemPool2= particleSystemPool;
-                });
+             timeLineEventLogicGroup =
+                combatHeroEntity.combatHeroTimeLineControl.AddEventLogicGroup("pengzhuang");
+            // _awaitTime = 1.0f;
+            // 
+            // CombatController.currActiveCombat.GameTimeLineParticleFactory.CreateParticle("fx_对拼气罩_loop",
+            //     myCombatMagicWeaponEntity.dotPos, null, false, null, delegate(ParticleSystemPool particleSystemPool)
+            //     {
+            //         particleSystemPool.transform.rotation =
+            //             myCombatMagicWeaponEntity.GameObject.transform.rotation;
+            //         _particleSystemPool1= particleSystemPool;
+            //     });
+          
         }
 
 
@@ -63,10 +63,8 @@ namespace GameLogic.Combat.Hero.State
 
         protected override void ProExit()
         {
-            GObjectPool.Instance.Recycle(_particleSystemPool1);
-            GObjectPool.Instance.Recycle(_particleSystemPool2);
-            _particleSystemPool1 = null;
-            _particleSystemPool2 = null;
+            timeLineEventLogicGroup?.CloseLoopFx();
+    
         }
 
         public override bool IsUpdateLockTarget()

Assets/Scripts/GameLogic/Combat/Hero/State/PlayerHeroIdleState.cs

@@ -12,7 +12,7 @@ namespace GameLogic.Combat.Hero.State
 
         protected override void ProUpdate(float t)
         {
-            if (combatHeroEntity.CombatHeroSkillControl.CanReleaseSkill() != null)
+            if (combatHeroEntity.CombatHeroSkillControl.This<CombatHeroSkillControl>().CanReleaseSkill() != null)
             {
                 combatHeroEntity.CombatAIBasic.ChangeState(CombatHeroStateType.att);
             }

Assets/Scripts/GameLogic/Combat/Skill/MagicSkill/MagicSkillBasic.cs

@@ -2,9 +2,34 @@ namespace GameLogic.Combat.Skill.MagicSkill
 {
     public class MagicSkillBasic : SkillBasic
     {
+        protected MagicAttShowBasic magicAttShowBasic;
+
+        
         protected override void ProUseSkill()
         {
-            
+            _finishTimeLineGroupName = "-1";
+            ProMagicUseSkill();
+        }
+        protected virtual void ProMagicUseSkill()
+        {
+        }
+        protected void SetMagicAttShowBasic(MagicAttShowBasic magicAttShowBasic)
+        {
+            this.magicAttShowBasic = magicAttShowBasic;
+        }
+
+        protected override void ProCombatUpdate(float time)
+        {
+            if (magicAttShowBasic != null)
+            {
+                magicAttShowBasic.Update(time);
+            }
+
+            MagicSkillUpdate(time);
+        }
+
+        protected virtual void MagicSkillUpdate(float time)
+        {
         }
     }
 }

Assets/Scripts/GameLogic/Combat/Skill/MagicSkill/S901001.cs

@@ -0,0 +1,42 @@
+using GameLogic.Combat.CombatTool;
+using UnityEngine;
+using UTool.CustomizeTimeLogic.FxLogic.TimeLineEventinterface;
+
+namespace GameLogic.Combat.Skill.MagicSkill
+{
+    /// <summary>
+    /// 法宝技能
+    /// </summary>
+    public class S901001 : MagicSkillBasic
+    {
+        private CombatHeroEntity target;
+
+        protected override void ProMagicUseSkill()
+        {
+            StraightLineShow straightLineShow = new StraightLineShow();
+            straightLineShow.Init(this);
+            CombatHeroEntity[] allHero =
+                CombatController.currActiveCombat.CombatHeroController.GetHero(!CombatHeroEntity.IsEnemy);
+            if (allHero == null || allHero.Length <= 0)
+            {
+                SkillPlayFinish();
+                return;
+            }
+
+            target = allHero[0];
+
+            straightLineShow.SetTarget(allHero[0], Finish);
+            SetMagicAttShowBasic(straightLineShow);
+        }
+
+        private void Finish()
+        {
+            Debug.Log("法宝对敌人照成伤害");
+            ILifetCycleHitPoint lifetCycleHitPoint = target.GetMainHotPoin<ILifetCycleHitPoint>();
+            BetterList<ILifetCycleHitPoint> cBetterList = new BetterList<ILifetCycleHitPoint>(1);
+            cBetterList.Add(lifetCycleHitPoint);
+            ActivationTimeLineData("gongji", currTarget: cBetterList);
+            SkillPlayFinish();
+        }
+    }
+}

Assets/Scripts/GameLogic/Combat/Skill/MagicSkill/S910001.cs

@@ -1,9 +0,0 @@
-namespace GameLogic.Combat.Skill.MagicSkill
-{
-    /// <summary>
-    /// 法宝技能
-    /// </summary>
-    public class S910001 : MagicSkillBasic
-    {
-    }
-}

Assets/Scripts/GameLogic/Combat/Skill/MagicSkill/SkillShow/MagicAttShowBasic.cs

@@ -2,13 +2,33 @@ namespace GameLogic.Combat.Skill.MagicSkill
 {
     public class MagicAttShowBasic
     {
+        protected SkillBasic _skillBasic;
+
+        protected bool isUpdate;
+        public void Init(SkillBasic skillBasic)
+        {
+            _skillBasic= skillBasic;
+            isUpdate = true;
+            ProInit();
+        }
+        protected virtual void ProInit()
+        {
+            
+        }
+
         public void Update(float t)
         {
+            if (!isUpdate)
+            {
+                return;
+            }
+
             ProUpdate(t);
         }
 
         protected virtual void ProUpdate(float t)
         {
+            
         }
     }
 }

Assets/Scripts/GameLogic/Combat/Skill/MagicSkill/SkillShow/StraightLineShow.cs

@@ -1,6 +1,66 @@
+using Common.Utility.CombatEvent;
+using Core.Utility;
+using Fort23.Core;
+using OfficeOpenXml.FormulaParsing.Excel.Functions.Logical;
+using UnityEngine;
+using Utility.CTween;
+
 namespace GameLogic.Combat.Skill.MagicSkill
 {
     public class StraightLineShow : MagicAttShowBasic
     {
+        private CombatHeroEntity target;
+        private BesselPath _besselPath;
+        private float allTime;
+        private float speed = 15;
+
+        private float addTime;
+        private System.Action callBack;
+
+        public void SetTarget(CombatHeroEntity target, System.Action callBack)
+        {
+            this.callBack = callBack;
+            this.target = target;
+            _besselPath = CObjectPool.Instance.Fetch<BesselPath>();
+            _skillBasic.CombatHeroEntity.GameObject.transform.eulerAngles = Vector3.zero;
+            Vector3 p1 =
+                _skillBasic.CombatHeroEntity.GameObject.transform.TransformPoint(new Vector3(-5f, 5f, 5f));
+            Vector3 p2 = SetTargetPos2();
+            _besselPath.controlPoints.Add(_skillBasic.CombatHeroEntity.GameObject.transform.position);
+            _besselPath.controlPoints.Add(p1);
+            _besselPath.controlPoints.Add(p2);
+            _besselPath.controlPoints.Add(target.dotPos);
+            float d = _besselPath.GetLengthAtT(allTime);
+     
+            addTime = 1.0f / (d / speed);
+            allTime = 0;
+        }
+
+        protected Vector3 SetTargetPos2()
+        {
+            Vector3 p2 = target.GameObject.transform.TransformPoint(new Vector3(-5f, 1f, 5f));
+            return p2;
+        }
+
+        protected override void ProUpdate(float t)
+        {
+            Vector3 p2 = SetTargetPos2();
+            _besselPath.controlPoints[2] = p2;
+            _besselPath.controlPoints[3] = target.dotPos;
+
+            allTime += t * addTime;
+            float v = CustomTweenManager.AnimationCurveLibrary.fabaoAtt.Evaluate(allTime);
+            Vector3 lasetPos = _besselPath.CalculatePoint(v - 0.01f);
+            Vector3 p = _besselPath.CalculatePoint(v);
+            _skillBasic.CombatHeroEntity.combatHeroGameObject.SetPosition(p);
+            Quaternion quaternion = Quaternion.LookRotation((p - lasetPos).normalized);
+            _skillBasic.CombatHeroEntity.GameObject.transform.rotation =
+                Quaternion.Lerp(_skillBasic.CombatHeroEntity.GameObject.transform.rotation, quaternion, 0.5f);
+            if (allTime >= 1)
+            {
+                isUpdate = false;
+                callBack?.Invoke();
+            }
+        }
     }
 }

UserSettings/Layouts/default-2022.dwlt

@@ -1,30 +1,6 @@
 %YAML 1.1
 %TAG !u! tag:yousandi.cn,2023:
 --- !u!114 &1
-MonoBehaviour:
-  m_ObjectHideFlags: 52
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 0}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 12004, guid: 0000000000000000e000000000000000, type: 0}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_PixelRect:
-    serializedVersion: 2
-    x: 1586.6667
-    y: 425.33334
-    width: 942
-    height: 1019.3334
-  m_ShowMode: 0
-  m_Title: Timeline
-  m_RootView: {fileID: 4}
-  m_MinSize: {x: 100, y: 121}
-  m_MaxSize: {x: 4000, y: 4021}
-  m_Maximized: 0
---- !u!114 &2
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -39,16 +15,16 @@ MonoBehaviour:
   m_PixelRect:
     serializedVersion: 2
     x: 0
-    y: 42.666668
+    y: 43
     width: 2560
-    height: 1349.3334
+    height: 1349
   m_ShowMode: 4
-  m_Title: Hierarchy
-  m_RootView: {fileID: 9}
+  m_Title: Inspector
+  m_RootView: {fileID: 7}
   m_MinSize: {x: 875, y: 300}
   m_MaxSize: {x: 10000, y: 10000}
   m_Maximized: 1
---- !u!114 &3
+--- !u!114 &2
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -64,42 +40,17 @@ MonoBehaviour:
   m_Position:
     serializedVersion: 2
     x: 0
-    y: 0
-    width: 942
-    height: 1019.3334
-  m_MinSize: {x: 100, y: 121}
-  m_MaxSize: {x: 4000, y: 4021}
-  m_ActualView: {fileID: 15}
+    y: 710
+    width: 875
+    height: 234
+  m_MinSize: {x: 100, y: 100}
+  m_MaxSize: {x: 4000, y: 4000}
+  m_ActualView: {fileID: 13}
   m_Panes:
-  - {fileID: 15}
+  - {fileID: 13}
   m_Selected: 0
   m_LastSelected: 0
---- !u!114 &4
-MonoBehaviour:
-  m_ObjectHideFlags: 52
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 0}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 12010, guid: 0000000000000000e000000000000000, type: 0}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_Children:
-  - {fileID: 3}
-  m_Position:
-    serializedVersion: 2
-    x: 0
-    y: 0
-    width: 942
-    height: 1019.3334
-  m_MinSize: {x: 100, y: 121}
-  m_MaxSize: {x: 4000, y: 4021}
-  vertical: 0
-  controlID: 18
-  draggingID: 0
---- !u!114 &5
+--- !u!114 &3
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -115,9 +66,9 @@ MonoBehaviour:
   m_Position:
     serializedVersion: 2
     x: 0
-    y: 790.6667
-    width: 832
-    height: 508.6667
+    y: 944
+    width: 875
+    height: 355
   m_MinSize: {x: 232, y: 271}
   m_MaxSize: {x: 10002, y: 10021}
   m_ActualView: {fileID: 22}
@@ -125,7 +76,7 @@ MonoBehaviour:
   - {fileID: 22}
   m_Selected: 0
   m_LastSelected: 0
---- !u!114 &6
+--- !u!114 &4
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -138,20 +89,21 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Children:
-  - {fileID: 14}
-  - {fileID: 5}
+  - {fileID: 12}
+  - {fileID: 2}
+  - {fileID: 3}
   m_Position:
     serializedVersion: 2
-    x: 404
+    x: 779
     y: 0
-    width: 832
-    height: 1299.3334
-  m_MinSize: {x: 100, y: 100}
-  m_MaxSize: {x: 8096, y: 16192}
+    width: 875
+    height: 1299
+  m_MinSize: {x: 100, y: 150}
+  m_MaxSize: {x: 8096, y: 24288}
   vertical: 1
-  controlID: 61
+  controlID: 43
   draggingID: 0
---- !u!114 &7
+--- !u!114 &5
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -166,19 +118,19 @@ MonoBehaviour:
   m_Children: []
   m_Position:
     serializedVersion: 2
-    x: 2016.6666
+    x: 2016
     y: 0
-    width: 543.3334
-    height: 1299.3334
-  m_MinSize: {x: 276, y: 71}
-  m_MaxSize: {x: 4001, y: 4021}
+    width: 544
+    height: 1299
+  m_MinSize: {x: 275, y: 50}
+  m_MaxSize: {x: 4000, y: 4000}
   m_ActualView: {fileID: 21}
   m_Panes:
   - {fileID: 21}
   - {fileID: 16}
   m_Selected: 0
   m_LastSelected: 1
---- !u!114 &8
+--- !u!114 &6
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -195,16 +147,16 @@ MonoBehaviour:
     serializedVersion: 2
     x: 0
     y: 0
-    width: 404
-    height: 1299.3334
-  m_MinSize: {x: 201, y: 221}
-  m_MaxSize: {x: 4001, y: 4021}
+    width: 779
+    height: 1299
+  m_MinSize: {x: 200, y: 200}
+  m_MaxSize: {x: 4000, y: 4000}
   m_ActualView: {fileID: 23}
   m_Panes:
   - {fileID: 23}
   m_Selected: 0
   m_LastSelected: 0
---- !u!114 &9
+--- !u!114 &7
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -217,22 +169,22 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Children:
+  - {fileID: 8}
+  - {fileID: 9}
   - {fileID: 10}
-  - {fileID: 11}
-  - {fileID: 12}
   m_Position:
     serializedVersion: 2
     x: 0
     y: 0
     width: 2560
-    height: 1349.3334
+    height: 1349
   m_MinSize: {x: 875, y: 300}
   m_MaxSize: {x: 10000, y: 10000}
   m_UseTopView: 1
   m_TopViewHeight: 30
   m_UseBottomView: 1
   m_BottomViewHeight: 20
---- !u!114 &10
+--- !u!114 &8
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -254,7 +206,7 @@ MonoBehaviour:
   m_MinSize: {x: 0, y: 0}
   m_MaxSize: {x: 0, y: 0}
   m_LastLoadedLayoutName: 
---- !u!114 &11
+--- !u!114 &9
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -267,22 +219,22 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Children:
-  - {fileID: 8}
   - {fileID: 6}
-  - {fileID: 13}
-  - {fileID: 7}
+  - {fileID: 4}
+  - {fileID: 11}
+  - {fileID: 5}
   m_Position:
     serializedVersion: 2
     x: 0
     y: 30
     width: 2560
-    height: 1299.3334
-  m_MinSize: {x: 400, y: 100}
-  m_MaxSize: {x: 32384, y: 16192}
+    height: 1299
+  m_MinSize: {x: 400, y: 150}
+  m_MaxSize: {x: 32384, y: 24288}
   vertical: 0
-  controlID: 60
+  controlID: 42
   draggingID: 0
---- !u!114 &12
+--- !u!114 &10
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -298,12 +250,12 @@ MonoBehaviour:
   m_Position:
     serializedVersion: 2
     x: 0
-    y: 1329.3334
+    y: 1329
     width: 2560
     height: 20
   m_MinSize: {x: 0, y: 0}
   m_MaxSize: {x: 0, y: 0}
---- !u!114 &13
+--- !u!114 &11
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -318,18 +270,18 @@ MonoBehaviour:
   m_Children: []
   m_Position:
     serializedVersion: 2
-    x: 1236
+    x: 1654
     y: 0
-    width: 780.6666
-    height: 1299.3334
-  m_MinSize: {x: 202, y: 221}
-  m_MaxSize: {x: 4002, y: 4021}
+    width: 362
+    height: 1299
+  m_MinSize: {x: 200, y: 200}
+  m_MaxSize: {x: 4000, y: 4000}
   m_ActualView: {fileID: 20}
   m_Panes:
   - {fileID: 20}
   m_Selected: 0
   m_LastSelected: 0
---- !u!114 &14
+--- !u!114 &12
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -346,8 +298,8 @@ MonoBehaviour:
     serializedVersion: 2
     x: 0
     y: 0
-    width: 832
-    height: 790.6667
+    width: 875
+    height: 710
   m_MinSize: {x: 202, y: 221}
   m_MaxSize: {x: 4002, y: 4021}
   m_ActualView: {fileID: 24}
@@ -356,9 +308,11 @@ MonoBehaviour:
   - {fileID: 19}
   - {fileID: 18}
   - {fileID: 17}
+  - {fileID: 15}
+  - {fileID: 14}
   m_Selected: 0
-  m_LastSelected: 0
---- !u!114 &15
+  m_LastSelected: 5
+--- !u!114 &13
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -374,14 +328,14 @@ MonoBehaviour:
   m_MaxSize: {x: 4000, y: 4000}
   m_TitleContent:
     m_Text: Timeline
-    m_Image: {fileID: -5401195905404635996, guid: 0000000000000000d000000000000000, type: 0}
+    m_Image: {fileID: -9173288242387172643, guid: 0000000000000000d000000000000000, type: 0}
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 1586.6667
-    y: 425.33334
-    width: 942
-    height: 998.3334
+    x: 779
+    y: 783
+    width: 873
+    height: 213
   m_SerializedDataModeController:
     m_DataMode: 0
     m_PreferredDataMode: 0
@@ -396,11 +350,153 @@ MonoBehaviour:
     editType: 0
     timeReferenceMode: 0
   m_LockTracker:
-    m_IsLocked: 1
+    m_IsLocked: 0
   m_SequenceHierarchy: {fileID: 0}
   m_SequencePath:
-    m_SelectionRoot: -3140
+    m_SelectionRoot: 0
     m_SubElements: []
+--- !u!114 &14
+MonoBehaviour:
+  m_ObjectHideFlags: 52
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 5ce82e4a867719941a5e8f1fba513d28, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_MinSize: {x: 100, y: 100}
+  m_MaxSize: {x: 4000, y: 4000}
+  m_TitleContent:
+    m_Text: Transition Library
+    m_Image: {fileID: 5779557562189929939, guid: 0000000000000000d000000000000000, type: 0}
+    m_Tooltip: 
+  m_Pos:
+    serializedVersion: 2
+    x: 779
+    y: 73
+    width: 873
+    height: 379
+  m_SerializedDataModeController:
+    m_DataMode: 0
+    m_PreferredDataMode: 0
+    m_SupportedDataModes: 
+    isAutomatic: 1
+  m_ViewDataDictionary: {fileID: 0}
+  m_OverlayCanvas:
+    m_LastAppliedPresetName: Default
+    m_SaveData: []
+    m_OverlaysVisible: 1
+  _SourceObject: {fileID: 11400000, guid: 7966078bfd2ccab4a92b1f0be02bcd95, type: 2}
+  _Data:
+    _Transitions:
+    - {fileID: 5519247924259519141, guid: 7966078bfd2ccab4a92b1f0be02bcd95, type: 2}
+    - {fileID: -5287561629531185777, guid: 7966078bfd2ccab4a92b1f0be02bcd95, type: 2}
+    _Modifiers:
+    - _From: 0
+      _To: 0
+      _Fade: 0
+    - _From: 1
+      _To: 0
+      _Fade: 0
+    - _From: 0
+      _To: 1
+      _Fade: 0
+    - _From: 1
+      _To: 1
+      _Fade: 0
+    _Aliases: []
+    _AliasAllTransitions: 0
+  _Selection: {fileID: 0}
+  _Pages:
+  - rid: 616298694836486144
+  - rid: 616298694836486145
+  _CurrentPage: 0
+  references:
+    version: 2
+    RefIds:
+    - rid: 616298694836486144
+      type: {class: TransitionLibraryModifiersPage, ns: Animancer.Editor.TransitionLibraries, asm: Kybernetik.Animancer.Editor}
+      data:
+        _TableGUI:
+          _LabelSize: {x: 0.25, y: 0.25}
+          _ScrollPosition: {x: 0, y: 0}
+    - rid: 616298694836486145
+      type: {class: TransitionLibraryAliasesPage, ns: Animancer.Editor.TransitionLibraries, asm: Kybernetik.Animancer.Editor}
+      data:
+        _ScrollPosition: {x: 0, y: 0}
+--- !u!114 &15
+MonoBehaviour:
+  m_ObjectHideFlags: 52
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 12914, guid: 0000000000000000e000000000000000, type: 0}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_MinSize: {x: 100, y: 100}
+  m_MaxSize: {x: 4000, y: 4000}
+  m_TitleContent:
+    m_Text: Animator
+    m_Image: {fileID: -1673928668082335149, guid: 0000000000000000d000000000000000, type: 0}
+    m_Tooltip: 
+  m_Pos:
+    serializedVersion: 2
+    x: 945
+    y: 73
+    width: 707
+    height: 635
+  m_SerializedDataModeController:
+    m_DataMode: 0
+    m_PreferredDataMode: 0
+    m_SupportedDataModes: 
+    isAutomatic: 1
+  m_ViewDataDictionary: {fileID: 0}
+  m_OverlayCanvas:
+    m_LastAppliedPresetName: Default
+    m_SaveData: []
+    m_OverlaysVisible: 1
+  m_ViewTransforms:
+    m_KeySerializationHelper:
+    - {fileID: 8880992995406065698, guid: 2a36f84396bfa604480a063c8564d90b, type: 2}
+    m_ValueSerializationHelper:
+    - e00: 0.85
+      e01: 0
+      e02: 0
+      e03: -167.59998
+      e10: 0
+      e11: 0.85
+      e12: 0
+      e13: 150.2
+      e20: 0
+      e21: 0
+      e22: 1
+      e23: 0
+      e30: 0
+      e31: 0
+      e32: 0
+      e33: 1
+  m_PreviewAnimator: {fileID: 0}
+  m_AnimatorController: {fileID: 9100000, guid: 2a36f84396bfa604480a063c8564d90b, type: 2}
+  m_BreadCrumbs:
+  - m_Target: {fileID: 8880992995406065698, guid: 2a36f84396bfa604480a063c8564d90b, type: 2}
+    m_ScrollPosition: {x: 0, y: 0}
+  stateMachineGraph: {fileID: 0}
+  stateMachineGraphGUI: {fileID: 0}
+  blendTreeGraph: {fileID: 0}
+  blendTreeGraphGUI: {fileID: 0}
+  m_AutoLiveLink: 1
+  m_MiniTool: 0
+  m_LockTracker:
+    m_IsLocked: 0
+  m_CurrentEditor: 0
+  m_LayerEditor:
+    m_SelectedLayerIndex: 0
 --- !u!114 &16
 MonoBehaviour:
   m_ObjectHideFlags: 52
@@ -417,7 +513,7 @@ MonoBehaviour:
   m_MaxSize: {x: 4000, y: 4000}
   m_TitleContent:
     m_Text: Lighting
-    m_Image: {fileID: -1477008817101679558, guid: 0000000000000000d000000000000000, type: 0}
+    m_Image: {fileID: -1347227620855488341, guid: 0000000000000000d000000000000000, type: 0}
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
@@ -2381,14 +2477,14 @@ MonoBehaviour:
   m_MaxSize: {x: 4000, y: 4000}
   m_TitleContent:
     m_Text: Hierarchy
-    m_Image: {fileID: -3734745235275155857, guid: 0000000000000000d000000000000000, type: 0}
+    m_Image: {fileID: 7966133145522015247, guid: 0000000000000000d000000000000000, type: 0}
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 1236
-    y: 72.66667
-    width: 778.6666
-    height: 1278.3334
+    x: 1654
+    y: 73
+    width: 360
+    height: 1278
   m_SerializedDataModeController:
     m_DataMode: 0
     m_PreferredDataMode: 0
@@ -2404,23 +2500,23 @@ MonoBehaviour:
       scrollPos: {x: 0, y: 0}
       m_SelectedIDs: 
       m_LastClickedID: 0
-      m_ExpandedIDs: aaf3ffffc4f3ffff6ef5ffffa6f5ffffacf7ffff
+      m_ExpandedIDs: 0c88fdff6888fdff341efeff641efeffa41efeffd41efeff10bdfeffa0befeffacbefeffbcbefeffd6befeffdabefeffe0befeffecbefeffe605ffffe63effff78faffffb2a80000
       m_RenameOverlay:
         m_UserAcceptedRename: 0
-        m_Name: fb_wulonglun
-        m_OriginalName: fb_wulonglun
+        m_Name: GameObject (1)
+        m_OriginalName: GameObject (1)
         m_EditFieldRect:
           serializedVersion: 2
           x: 0
           y: 0
           width: 0
           height: 0
-        m_UserData: -3132
+        m_UserData: -161744
         m_IsWaitingForDelay: 0
         m_IsRenaming: 0
         m_OriginalEventType: 0
         m_IsRenamingFilename: 0
-        m_ClientGUIView: {fileID: 13}
+        m_ClientGUIView: {fileID: 11}
       m_SearchString: 
     m_ExpandedScenes: []
     m_CurrenRootInstanceID: 0
@@ -2444,14 +2540,14 @@ MonoBehaviour:
   m_MaxSize: {x: 4000, y: 4000}
   m_TitleContent:
     m_Text: Inspector
-    m_Image: {fileID: -440750813802333266, guid: 0000000000000000d000000000000000, type: 0}
+    m_Image: {fileID: -2667387946076563598, guid: 0000000000000000d000000000000000, type: 0}
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 2016.6667
-    y: 72.66667
-    width: 542.3334
-    height: 1278.3334
+    x: 2016
+    y: 73
+    width: 543
+    height: 1278
   m_SerializedDataModeController:
     m_DataMode: 0
     m_PreferredDataMode: 0
@@ -2465,7 +2561,7 @@ MonoBehaviour:
   m_ObjectsLockedBeforeSerialization: []
   m_InstanceIDsLockedBeforeSerialization: 
   m_PreviewResizer:
-    m_CachedPref: 513.3333
+    m_CachedPref: 576
     m_ControlHash: -371814159
     m_PrefName: Preview_InspectorPreview
   m_LastInspectedObjectInstanceID: -1
@@ -2491,14 +2587,14 @@ MonoBehaviour:
   m_MaxSize: {x: 10000, y: 10000}
   m_TitleContent:
     m_Text: Project
-    m_Image: {fileID: -5179483145760003458, guid: 0000000000000000d000000000000000, type: 0}
+    m_Image: {fileID: -5467254957812901981, guid: 0000000000000000d000000000000000, type: 0}
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 404
-    y: 863.3334
-    width: 830
-    height: 487.6667
+    x: 779
+    y: 1017
+    width: 873
+    height: 334
   m_SerializedDataModeController:
     m_DataMode: 0
     m_PreferredDataMode: 0
@@ -2510,7 +2606,7 @@ MonoBehaviour:
     m_SaveData: []
     m_OverlaysVisible: 1
   m_SearchFilter:
-    m_NameFilter: 
+    m_NameFilter: fb_yup
     m_ClassNames: []
     m_AssetLabels: []
     m_AssetBundleNames: []
@@ -2520,24 +2616,24 @@ MonoBehaviour:
     m_SkipHidden: 0
     m_SearchArea: 1
     m_Folders:
-    - Assets/Art/Character
+    - Assets/Art/FaBaoMesh/1
     m_Globs: []
-    m_OriginalText: 
+    m_OriginalText: fb_yup
     m_ImportLogFlags: 0
     m_FilterByTypeIntersection: 0
   m_ViewMode: 1
   m_StartGridSize: 16
   m_LastFolders:
-  - Assets/Art/Character
+  - Assets/Art/FaBaoMesh/1
   m_LastFoldersGridSize: 16
-  m_LastProjectPath: H:\XY002\XiuXianGame
+  m_LastProjectPath: D:\unityProject\XiuXianGame
   m_LockTracker:
     m_IsLocked: 0
   m_FolderTreeState:
-    scrollPos: {x: 0, y: 60}
-    m_SelectedIDs: 7ec70000
-    m_LastClickedID: 51070
-    m_ExpandedIDs: 0000000068c700006ac700006cc700006ec7000070c7000072c7000074c7000076c7000078c700007ac700007cc700007ec7000000ca9a3bffffff7f
+    scrollPos: {x: 0, y: 223}
+    m_SelectedIDs: f8370100
+    m_LastClickedID: 79864
+    m_ExpandedIDs: 00000000b0af0000b2af0000b4af0000b6af0000b8af0000baaf0000bcaf0000beaf0000c0af0000c2af0000c4af0000d8af0000e0af0000eaaf000002b0000008b0000014b0000018b000005ebc0000a409010000ca9a3bffffff7f
     m_RenameOverlay:
       m_UserAcceptedRename: 0
       m_Name: 
@@ -2553,7 +2649,7 @@ MonoBehaviour:
       m_IsRenaming: 0
       m_OriginalEventType: 11
       m_IsRenamingFilename: 1
-      m_ClientGUIView: {fileID: 5}
+      m_ClientGUIView: {fileID: 3}
     m_SearchString: 
     m_CreateAssetUtility:
       m_EndAction: {fileID: 0}
@@ -2565,7 +2661,7 @@ MonoBehaviour:
     scrollPos: {x: 0, y: 0}
     m_SelectedIDs: 
     m_LastClickedID: 0
-    m_ExpandedIDs: 0000000068c700006ac700006cc700006ec7000070c7000072c7000074c7000076c7000078c700007ac700007cc700007ec70000
+    m_ExpandedIDs: 00000000b0af0000b2af0000b4af0000b6af0000b8af0000baaf0000bcaf0000beaf0000c0af0000c2af0000c4af0000
     m_RenameOverlay:
       m_UserAcceptedRename: 0
       m_Name: 
@@ -2593,23 +2689,23 @@ MonoBehaviour:
     m_SelectedInstanceIDs: 
     m_LastClickedInstanceID: 0
     m_HadKeyboardFocusLastEvent: 1
-    m_ExpandedInstanceIDs: bc7400008ebd000008bd0000300b0100b0ae00005cdf0000c8480100f630010094b1000014b3000090b4000088b4000042b40000aab40000fcb3000044b30000a2b400007cb400008cb4000048a501003eb2000022b20000e0be0000e6320100d6d6000084e10000501c01004c2401006ebc00006cbc00001c3a0100
+    m_ExpandedInstanceIDs: bc7400008ebd000008bd0000300b0100b0ae00005cdf0000c8480100f630010094b1000014b3000090b4000088b4000042b40000aab40000fcb3000044b30000a2b400007cb400008cb4000048a501003eb2000022b2000070de000056dc000020af00001cad00001aad000074c8000070c80000
     m_RenameOverlay:
       m_UserAcceptedRename: 0
-      m_Name: 
-      m_OriginalName: 
+      m_Name: fb_yuping
+      m_OriginalName: fb_yuping
       m_EditFieldRect:
         serializedVersion: 2
         x: 0
         y: 0
         width: 0
         height: 0
-      m_UserData: 0
+      m_UserData: 51324
       m_IsWaitingForDelay: 0
       m_IsRenaming: 0
-      m_OriginalEventType: 11
+      m_OriginalEventType: 0
       m_IsRenamingFilename: 1
-      m_ClientGUIView: {fileID: 5}
+      m_ClientGUIView: {fileID: 3}
     m_CreateAssetUtility:
       m_EndAction: {fileID: 0}
       m_InstanceID: 0
@@ -2620,7 +2716,7 @@ MonoBehaviour:
     m_ScrollPosition: {x: 0, y: 0}
     m_GridSize: 16
   m_SkipHiddenPackages: 0
-  m_DirectoriesAreaWidth: 206.33325
+  m_DirectoriesAreaWidth: 310
 --- !u!114 &23
 MonoBehaviour:
   m_ObjectHideFlags: 52
@@ -2637,14 +2733,14 @@ MonoBehaviour:
   m_MaxSize: {x: 4000, y: 4000}
   m_TitleContent:
     m_Text: Game
-    m_Image: {fileID: 4621777727084837110, guid: 0000000000000000d000000000000000, type: 0}
+    m_Image: {fileID: -6423792434712278376, guid: 0000000000000000d000000000000000, type: 0}
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
     x: 0
-    y: 72.66667
-    width: 403
-    height: 1278.3334
+    y: 73
+    width: 778
+    height: 1278
   m_SerializedDataModeController:
     m_DataMode: 0
     m_PreferredDataMode: 0
@@ -2676,10 +2772,10 @@ MonoBehaviour:
     m_VRangeLocked: 0
     hZoomLockedByDefault: 0
     vZoomLockedByDefault: 0
-    m_HBaseRangeMin: -250
-    m_HBaseRangeMax: 250
-    m_VBaseRangeMin: -541.3334
-    m_VBaseRangeMax: 541.3334
+    m_HBaseRangeMin: -375
+    m_HBaseRangeMax: 375
+    m_VBaseRangeMin: -812
+    m_VBaseRangeMax: 812
     m_HAllowExceedBaseRangeMin: 1
     m_HAllowExceedBaseRangeMax: 1
     m_VAllowExceedBaseRangeMin: 1
@@ -2697,23 +2793,23 @@ MonoBehaviour:
       serializedVersion: 2
       x: 0
       y: 21
-      width: 403
-      height: 1257.3334
-    m_Scale: {x: 0.806, y: 0.806}
-    m_Translation: {x: 201.5, y: 628.6667}
+      width: 778
+      height: 1257
+    m_Scale: {x: 0.7740148, y: 0.7740148}
+    m_Translation: {x: 389, y: 628.5}
     m_MarginLeft: 0
     m_MarginRight: 0
     m_MarginTop: 0
     m_MarginBottom: 0
     m_LastShownAreaInsideMargins:
       serializedVersion: 2
-      x: -250
-      y: -779.98346
-      width: 500
-      height: 1559.9669
+      x: -502.5744
+      y: -812
+      width: 1005.1488
+      height: 1624
     m_MinimalGUI: 1
-  m_defaultScale: 0.806
-  m_LastWindowPixelSize: {x: 604.5, y: 1917.5}
+  m_defaultScale: 0.7740148
+  m_LastWindowPixelSize: {x: 778, y: 1278}
   m_ClearInEditMode: 1
   m_NoCameraWarning: 1
   m_LowResolutionForAspectRatios: 00000000000000000000
@@ -2735,14 +2831,14 @@ MonoBehaviour:
   m_MaxSize: {x: 4000, y: 4000}
   m_TitleContent:
     m_Text: Scene
-    m_Image: {fileID: 8634526014445323508, guid: 0000000000000000d000000000000000, type: 0}
+    m_Image: {fileID: 2593428753322112591, guid: 0000000000000000d000000000000000, type: 0}
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 404
-    y: 72.66667
-    width: 830
-    height: 769.6667
+    x: 779
+    y: 73
+    width: 873
+    height: 689
   m_SerializedDataModeController:
     m_DataMode: 0
     m_PreferredDataMode: 0
@@ -2757,7 +2853,7 @@ MonoBehaviour:
       floating: 0
       collapsed: 0
       displayed: 1
-      snapOffset: {x: -177.33337, y: -26.666687}
+      snapOffset: {x: -174, y: -26.666687}
       snapOffsetDelta: {x: 0, y: 0}
       snapCorner: 3
       id: Tool Settings
@@ -2783,7 +2879,7 @@ MonoBehaviour:
       floating: 0
       collapsed: 0
       displayed: 1
-      snapOffset: {x: 0, y: 24.666666}
+      snapOffset: {x: 0, y: 25}
       snapOffsetDelta: {x: 0, y: 0}
       snapCorner: 0
       id: unity-scene-view-toolbar
@@ -2809,7 +2905,7 @@ MonoBehaviour:
       floating: 0
       collapsed: 0
       displayed: 1
-      snapOffset: {x: 0, y: 24.666666}
+      snapOffset: {x: 0, y: 25}
       snapOffsetDelta: {x: 0, y: 0}
       snapCorner: 0
       id: unity-transform-toolbar
@@ -2835,9 +2931,9 @@ MonoBehaviour:
       floating: 0
       collapsed: 0
       displayed: 1
-      snapOffset: {x: 67.5, y: 86}
-      snapOffsetDelta: {x: 0, y: 0}
-      snapCorner: 0
+      snapOffset: {x: 67.5, y: -121}
+      snapOffsetDelta: {x: 0, y: -2}
+      snapCorner: 2
       id: Orientation
       index: 0
       layout: 4
@@ -2978,9 +3074,9 @@ MonoBehaviour:
       floating: 1
       collapsed: 0
       displayed: 0
-      snapOffset: {x: -262.6667, y: 131.33334}
+      snapOffset: {x: -289.33337, y: -121}
       snapOffsetDelta: {x: 0, y: 0}
-      snapCorner: 1
+      snapCorner: 3
       id: Scene View/Particles
       index: 0
       layout: 4
@@ -3105,7 +3201,7 @@ MonoBehaviour:
       sizeOverriden: 0
     m_OverlaysVisible: 1
   m_WindowGUID: d9e8ac729943301469eff8c7180f0e02
-  m_Gizmos: 0
+  m_Gizmos: 1
   m_OverrideSceneCullingMask: 6917529027641081856
   m_SceneIsLit: 1
   m_SceneLighting: 1
@@ -3114,9 +3210,9 @@ MonoBehaviour:
   m_PlayAudio: 0
   m_AudioPlay: 0
   m_Position:
-    m_Target: {x: 0.11250244, y: 9.598048, z: 4.351152}
+    m_Target: {x: -0.43593112, y: -1.2712173, z: 0.9120189}
     speed: 2
-    m_Value: {x: 0.11250244, y: 9.598048, z: 4.351152}
+    m_Value: {x: -0.43593112, y: -1.2712173, z: 0.9120189}
   m_RenderMode: 0
   m_CameraMode:
     drawMode: 0
@@ -3162,13 +3258,13 @@ MonoBehaviour:
     m_GridAxis: 1
     m_gridOpacity: 0.5
   m_Rotation:
-    m_Target: {x: -0.22197175, y: 0.36601, z: -0.09309824, w: -0.90013915}
+    m_Target: {x: 0.23096015, y: 0.09932555, z: -0.02380938, w: 0.96763974}
     speed: 2
-    m_Value: {x: -0.22164011, y: 0.36651567, z: -0.093219884, w: -0.8988058}
+    m_Value: {x: 0.23091245, y: 0.100771785, z: -0.024154566, w: 0.96744055}
   m_Size:
-    m_Target: 5.495394
+    m_Target: 3.6526446
     speed: 2
-    m_Value: 5.2587504
+    m_Value: 3.6612985
   m_Ortho:
     m_Target: 0
     speed: 2
@@ -3188,7 +3284,7 @@ MonoBehaviour:
     m_OcclusionCulling: 0
     m_EnableGDRP: 1
     m_BackfaceCulling: 0
-  m_LastSceneViewRotation: {x: -0.013364045, y: 0.6847265, z: -0.016198955, w: -0.7296338}
+  m_LastSceneViewRotation: {x: -0.08717229, y: 0.89959055, z: -0.21045254, w: -0.3726226}
   m_LastSceneViewOrtho: 0
   m_ReplacementShader: {fileID: 0}
   m_ReplacementString: