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

Assets/Art/HeroTimeLine/gf_1101_timeline.playable

@@ -347,6 +347,16 @@ MonoBehaviour:
   targetType: 2
   LocationType: 0
   targetSpecialDotName: 
+  isUseRandom: 0
+  xoff:
+    x: 0
+    y: 0
+  yoff:
+    x: 0
+    y: 0
+  zoff:
+    x: 0
+    y: 0
   hitPointGroupName: 
   isGround: 0
   isFollowTarget: 0
@@ -382,7 +392,7 @@ MonoBehaviour:
   m_Children: []
   m_Clips:
   - m_Version: 1
-    m_Start: 0.9
+    m_Start: 0.3333333333333333
     m_ClipIn: 0
     m_Asset: {fileID: -1891357024015680945}
     m_Duration: 1
@@ -593,6 +603,16 @@ MonoBehaviour:
   targetType: 2
   LocationType: 0
   targetSpecialDotName: 
+  isUseRandom: 0
+  xoff:
+    x: 0
+    y: 0
+  yoff:
+    x: 0
+    y: 0
+  zoff:
+    x: 0
+    y: 0
   hitPointGroupName: 
   isGround: 0
   isFollowTarget: 0
@@ -792,7 +812,7 @@ MonoBehaviour:
   m_Children: []
   m_Clips:
   - m_Version: 1
-    m_Start: 0.9
+    m_Start: 0.3333333333333333
     m_ClipIn: 0
     m_Asset: {fileID: 3170206750459385421}
     m_Duration: 1

Assets/Art/VFX/FXPrefabs/fx_gf_1101.prefab

@@ -9803,10 +9803,10 @@ GameObject:
   m_Component:
   - component: {fileID: 8611236716987058458}
   - component: {fileID: 20188554618317400}
-  - component: {fileID: 6296073204381576855}
   - component: {fileID: 1636458392407865816}
   - component: {fileID: 518704643645044999}
   - component: {fileID: 3725183313190313579}
+  - component: {fileID: 69591897721369811}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: fx_gf_1101
@@ -9856,42 +9856,6 @@ BoxCollider:
   serializedVersion: 3
   m_Size: {x: 0.33, y: 0.3, z: 1.7026665}
   m_Center: {x: 0, y: -0.011964202, z: 0.26296198}
---- !u!114 &6296073204381576855
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 3092355231103515585}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: ced634dc38e34b2196415a552336d24c, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  moveTarget: {fileID: 0}
-  delayTime: 0.3
-  multipleTargetDelayTime: 0.1
-  hitFxName: fx_gf_1101_hit
-  hitAudioName: 
-  extraMoveSpeed: 0
-  isNotMove: 0
-  isPenetrate: 0
-  isUseCustomTargetEndPos: 0
-  customTargetEndPosIndex: 0
-  size: 1
-  isInit: 0
-  speed: 30
-  roatRoot: {fileID: 0}
-  raotIndex: 0
-  parabolaCurveType: 0
-  isTriggerGroundEnd: 0
-  GroundHitFxName: 
-  isUseX: 1
-  BesselPath:
-    isActive: 0
-    controlPoints: []
-    allDis: 0
-  maxDis: 20
 --- !u!54 &1636458392407865816
 Rigidbody:
   m_ObjectHideFlags: 0
@@ -14719,6 +14683,42 @@ ParticleSystemRenderer:
   m_MeshWeighting2: 1
   m_MeshWeighting3: 1
   m_MaskInteraction: 0
+--- !u!114 &69591897721369811
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3092355231103515585}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 480de438e845cac40854ef243b9a8e35, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  moveTarget: {fileID: 0}
+  delayTime: 0.3
+  multipleTargetDelayTime: 0.1
+  hitFxName: fx_gf_1101_hit
+  hitAudioName: 
+  extraMoveSpeed: 0
+  isNotMove: 0
+  isPenetrate: 0
+  isUseCustomTargetEndPos: 0
+  customTargetEndPosIndex: 0
+  size: 1
+  isInit: 0
+  speed: 30
+  roatRoot: {fileID: 0}
+  raotIndex: 0
+  parabolaCurveType: 0
+  isTriggerGroundEnd: 0
+  GroundHitFxName: 
+  isUseX: 1
+  BesselPath:
+    isActive: 0
+    controlPoints: []
+    allDis: 0
+  maxTime: 10
 --- !u!1 &3250564432927346646
 GameObject:
   m_ObjectHideFlags: 0

Assets/Art/VFX/FXPrefabs/fx_gf_1101_1.prefab

@@ -14853,10 +14853,10 @@ GameObject:
   m_Component:
   - component: {fileID: 3331003496340091113}
   - component: {fileID: 8851455499910683743}
-  - component: {fileID: 3408703915910062878}
   - component: {fileID: 804866501308229775}
   - component: {fileID: 5816346683345018086}
   - component: {fileID: 3429626508995587215}
+  - component: {fileID: 3174578351217099842}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: fx_gf_1101_1
@@ -14907,39 +14907,6 @@ BoxCollider:
   serializedVersion: 3
   m_Size: {x: 0.33, y: 0.3, z: 1.7026665}
   m_Center: {x: 0, y: -0.011964202, z: 0.26296198}
---- !u!114 &3408703915910062878
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 5829723469742105471}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: ced634dc38e34b2196415a552336d24c, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  delayTime: 0
-  multipleTargetDelayTime: 0
-  hitFxName: fx_gf_1101_hit_1
-  hitAudioName: 
-  extraMoveSpeed: 0
-  isNotMove: 0
-  isPenetrate: 0
-  isUseCustomTargetEndPos: 0
-  customTargetEndPosIndex: 0
-  size: 1
-  isInit: 0
-  speed: 30
-  parabolaCurveType: 1
-  isTriggerGroundEnd: 0
-  GroundHitFxName: 
-  isUseX: 0
-  BesselPath:
-    isActive: 0
-    controlPoints: []
-    allDis: 0
-  maxDis: 20
 --- !u!54 &804866501308229775
 Rigidbody:
   m_ObjectHideFlags: 0
@@ -19767,6 +19734,42 @@ ParticleSystemRenderer:
   m_MeshWeighting2: 1
   m_MeshWeighting3: 1
   m_MaskInteraction: 0
+--- !u!114 &3174578351217099842
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5829723469742105471}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 480de438e845cac40854ef243b9a8e35, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  moveTarget: {fileID: 0}
+  delayTime: 0.3
+  multipleTargetDelayTime: 0.1
+  hitFxName: fx_gf_1101_hit
+  hitAudioName: 
+  extraMoveSpeed: 0
+  isNotMove: 0
+  isPenetrate: 0
+  isUseCustomTargetEndPos: 0
+  customTargetEndPosIndex: 0
+  size: 1
+  isInit: 0
+  speed: 30
+  roatRoot: {fileID: 0}
+  raotIndex: 0
+  parabolaCurveType: 0
+  isTriggerGroundEnd: 0
+  GroundHitFxName: 
+  isUseX: 1
+  BesselPath:
+    isActive: 0
+    controlPoints: []
+    allDis: 0
+  maxTime: 10
 --- !u!1 &8674631516313932850
 GameObject:
   m_ObjectHideFlags: 0

Assets/Scripts/GameLogic/Combat/Skill/S1101.cs

@@ -22,7 +22,8 @@ namespace GameLogic.Combat.Skill
                     .GetMainHotPoin<CombatHeroHitPoint>();
                 BetterList<ILifetCycleHitPoint> currTarget = new BetterList<ILifetCycleHitPoint>();
                 currTarget.Add(combatHeroHitPoint);
-                SpecialDotInfo specialDotInfo = CombatHeroEntity.GetSpecialDotInfo("zdpos" + (i + 2));
+                string dotName="zdpos" + (i%7 + 1);
+                SpecialDotInfo specialDotInfo = CombatHeroEntity.GetSpecialDotInfo(dotName);
                 ActivationTimeLineData("1101", currTarget: currTarget,
                     customizePos: new Vector3[] { specialDotInfo.GetWorlPos() }, indexCount: i);
             }

Assets/Scripts/GameLogic/Paritcle/ParitcleLogic/FxAILogicBasic.cs

@@ -215,7 +215,7 @@ namespace Common.Combat.FxAILogic
                 });
         }
 
-        public void CombatUpdate(float time)
+        public virtual void CombatUpdate(float time)
         {
             if (!_isUpdateBasic)
             {

Assets/Scripts/GameLogic/Paritcle/ParitcleLogic/S1101_FxLogic.cs

@@ -0,0 +1,46 @@
+using System.Collections;
+using System.Collections.Generic;
+using Common.Combat.FxAILogic;
+using UnityEngine;
+
+public class S1101_FxLogic : FxParabolaBulletLogic
+{
+    // public float move101Speed=
+    private int moveState = 0;
+    private Vector3 moveStateOneStartPos;
+    protected float moveStateTime;
+
+
+    protected override void ProInit()
+    {
+        moveState = 0;
+        moveStateTime = 0;
+        base.ProInit();
+        CombatHeroEntity combatHeroEntity = TimeLineEventParticleLogicBasic.castEntity as CombatHeroEntity;
+        moveStateOneStartPos = combatHeroEntity.dotPos;
+    }
+
+    public override void CombatUpdate(float time)
+    {
+        if (!_isUpdateBasic)
+        {
+            return;
+        }
+
+        if (moveState == 0)
+        {
+            moveStateTime += time * 4;
+            Vector3 newPos = Vector3.Lerp(moveStateOneStartPos, startPos, moveStateTime);
+            // moveTarget.transform.localScale = Vector3.Lerp(Vector3.zero, Vector3.one*size, moveStateTime);
+            moveTarget.transform.position = newPos;
+            if (moveStateTime >= 1)
+            {
+                moveState = 1;
+            }
+        }
+        else
+        {
+            base.CombatUpdate(time);
+        }
+    }
+}

Assets/Scripts/GameLogic/Paritcle/ParitcleLogic/S1101_FxLogic.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: C3If4X+pUHNDWddUXPuIyQPYYBGnerMKfTzZohy6hY3evySbZO2sZcg563in
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: