修改特效

Assets/Art/HeroTimeLine/Hero01.playable

@@ -381,7 +381,7 @@ MonoBehaviour:
   isNotRotate: 0
   isFollowRootTarget: 0
   isAttSpeed: 0
-  isLoop: 1
+  isLoop: 0
   loopAlone: 0
   isActivityCustomTargetPos: 0
   CustomTargetPosIndex: 0

Assets/Res/TimeLineAssets/Guaiwu02_TD.txt.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: Xn5Jtnn7AnvEo4DuvUfQAr00ZYzVHoLLzkZmmwGnu0RAOWyI8AGmlZM=
+TextScriptImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Res/TimeLineAssets/GuaiwuBoss02_TD.txt.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: DigasX+pBS8Pmrq8WY7dHYX30hbMsqOaV3NaCP75RLVIEdv6S9tFg1M=
+TextScriptImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Res/TimeLineAssets/GuaiwuJY02_TD.txt.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: CSsX5iykV3oXJE74R65qeBfaDEYq2IxV/Pt+Y9ELM9+UgdixSpWeyBs=
+TextScriptImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Res/UI/MainUIPanel.prefab

@@ -4474,6 +4474,24 @@ MonoBehaviour:
     - gameObject: {fileID: 6107101496507914859}
     - gameObject: {fileID: 397899105639740}
     - gameObject: {fileID: 3469845461661622283}
+  - key: fx_ui_coin
+    gameObject: {fileID: 279761164283339340}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas:
+    - gameObject: {fileID: 9073062006211861286}
+    - gameObject: {fileID: 6107101496507914859}
+    - gameObject: {fileID: 397899105639740}
+    - gameObject: {fileID: 3469845461661622283}
+  - key: fx_ui_exp
+    gameObject: {fileID: 8853248987449609378}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas:
+    - gameObject: {fileID: 9073062006211861286}
+    - gameObject: {fileID: 6107101496507914859}
+    - gameObject: {fileID: 397899105639740}
+    - gameObject: {fileID: 3469845461661622283}
   isAssetBundle: 1
 --- !u!1 &6750499123037776255
 GameObject:
@@ -5861,6 +5879,11 @@ RectTransform:
   m_CorrespondingSourceObject: {fileID: 175316671113568741, guid: 7f5a9c9a7b322614fbce15a45e076f45, type: 3}
   m_PrefabInstance: {fileID: 2452642478988529376}
   m_PrefabAsset: {fileID: 0}
+--- !u!1 &8853248987449609378 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 6400888696406557250, guid: 7f5a9c9a7b322614fbce15a45e076f45, type: 3}
+  m_PrefabInstance: {fileID: 2452642478988529376}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1001 &8921375891265068935
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -5965,6 +5988,10 @@ PrefabInstance:
       propertyPath: m_Enabled
       value: 1
       objectReference: {fileID: 0}
+    - target: {fileID: 7125274397353084997, guid: 5a9370d4ffd86274dadb8069eddb828e, type: 3}
+      propertyPath: m_SortingLayer
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 8660124463567240651, guid: 5a9370d4ffd86274dadb8069eddb828e, type: 3}
       propertyPath: m_Name
       value: fx_ui_coin
@@ -5978,6 +6005,11 @@ PrefabInstance:
     m_AddedGameObjects: []
     m_AddedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 5a9370d4ffd86274dadb8069eddb828e, type: 3}
+--- !u!1 &279761164283339340 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 8660124463567240651, guid: 5a9370d4ffd86274dadb8069eddb828e, type: 3}
+  m_PrefabInstance: {fileID: 8921375891265068935}
+  m_PrefabAsset: {fileID: 0}
 --- !u!224 &3872687123469740126 stripped
 RectTransform:
   m_CorrespondingSourceObject: {fileID: 5652462218939348953, guid: 5a9370d4ffd86274dadb8069eddb828e, type: 3}

Assets/Scripts/Core/UI/UTool/ImageMove.cs

@@ -14,12 +14,15 @@ public class ImageMove
     public ACurve currAcur;
     public float yanChi;
     private float currTime;
+
     public float speed;
+
     // public float showSizeSpeed;
     public bool isShowSize = true;
 
     public Vector3 moveTargetPos;
     public Vector3 moveStartPos;
+    public System.Action finishCallBack;
 
     public bool Update()
     {
@@ -66,7 +69,7 @@ public class ImageMove
         }
 
 
-        transform.anchoredPosition = currAcur.EvaluateForVector2(ms,ms);
+        transform.anchoredPosition = currAcur.EvaluateForVector2(ms, ms);
         float s = currTime;
         if (SizeCurve != null)
         {
@@ -79,6 +82,7 @@ public class ImageMove
 
         {
             currAcur.CurveInfos = null;
+            finishCallBack?.Invoke();
         }
 
         return false;

Assets/Scripts/GameUI/UI/MainUIPanelData.cs

@@ -175,6 +175,28 @@ namespace Fort23.Mono
 	      return _txtHeroExp;
 	     }
 	   }
+	  private GameObject _fx_ui_coin;
+	  public GameObject fx_ui_coin
+	   {
+	   get{
+	      if (_fx_ui_coin == null)
+	       {
+	         _fx_ui_coin  = GetUIUnit<GameObject>("fx_ui_coin"); 
+	       }
+	      return _fx_ui_coin;
+	     }
+	   }
+	  private GameObject _fx_ui_exp;
+	  public GameObject fx_ui_exp
+	   {
+	   get{
+	      if (_fx_ui_exp == null)
+	       {
+	         _fx_ui_exp  = GetUIUnit<GameObject>("fx_ui_exp"); 
+	       }
+	      return _fx_ui_exp;
+	     }
+	   }
 	  #endregion 自定义数据结束 
 	 public override async CTask SetUIGameObject(GameObject gObjectPoolInterface)
 	{

Assets/Scripts/GameUI/UI/ShowItemMoveTarget/ShowItemMoveToTargetPanel.cs

@@ -3,6 +3,7 @@ using CombatLibrary.CombatLibrary.CombatCore.Utility;
 using Common.Utility.CombatEvent;
 using Fort23.Core;
 using Fort23.UTool;
+using OfficeOpenXml.FormulaParsing.Excel.Functions.Logical;
 using UnityEngine;
 using UnityEngine.UI;
 using Utility.UITool;
@@ -17,7 +18,8 @@ namespace Fort23.Mono
         public static async CTask OpenShowItemMoveToTargetPanel()
         {
             ShowItemMoveToTargetPanel showItemMoveToTargetPanel =
-                await UIManager.Instance.LoadAndOpenPanel<ShowItemMoveToTargetPanel>(null, UILayer.Middle, isFocus: false);
+                await UIManager.Instance.LoadAndOpenPanel<ShowItemMoveToTargetPanel>(null, UILayer.Middle,
+                    isFocus: false);
         }
 
         public static async void OpenShowItemMoveToTargetPanel(Vector2 startPos, Vector2 target,
@@ -79,17 +81,53 @@ namespace Fort23.Mono
         {
             Vector2 target = moveTarget.GetComponent<RectTransform>().anchoredPosition;
             CombatItemShowEventData combatItemShowEventData = iEventData as CombatItemShowEventData;
-            if (combatItemShowEventData.isExp)
+            bool isExp = combatItemShowEventData.isExp;
+            if (isExp)
             {
                 MainUIPanel mainUIPanel = UIManager.Instance.GetComponent<MainUIPanel>();
                 Vector3 pos = mainUIPanel.expPoint.position;
                 target = transform.worldToLocalMatrix * pos;
             }
+
             Vector3 p = UIManager.Instance.CurrCustomCameraStack.camera.WorldToScreenPoint(
                 combatItemShowEventData.startPos_WorldPos);
             Vector3 p2 = UIManager.Instance.UICamera.ScreenToWorldPoint(p);
             Vector3 startPos = transform.worldToLocalMatrix * p2;
-            ShowPanel(startPos, target, combatItemShowEventData.count, combatItemShowEventData.showName);
+            ShowPanel(startPos, target, combatItemShowEventData.count, combatItemShowEventData.showName, delegate
+            {
+                MainUIPanel mainUIPanel = UIManager.Instance.GetComponent<MainUIPanel>();
+                if (mainUIPanel == null)
+                {
+                    return;
+                }
+
+                if (isExp)
+                {
+                    if (mainUIPanel != null)
+                    {
+                        ParticleSystemPool particleSystemPool =
+                            GObjectPool.Instance.FetchAsyncForGameObject<ParticleSystemPool>(mainUIPanel.fx_ui_exp,
+                                "fx_ui_exp");
+                        particleSystemPool.transform.SetParent(mainUIPanel.expPoint.transform);
+                        particleSystemPool.transform.localPosition = Vector3.zero;
+                        particleSystemPool.transform.localScale = Vector3.one;
+                        // particleSystemPool.transform.
+                    }
+                }
+                else
+                {
+                    if (mainUIPanel != null)
+                    {
+                        ParticleSystemPool particleSystemPool =
+                            GObjectPool.Instance.FetchAsyncForGameObject<ParticleSystemPool>(mainUIPanel.fx_ui_coin,
+                                "fx_ui_coin");
+                        particleSystemPool.transform.SetParent(mainUIPanel.Icon_Coin.transform);
+                        particleSystemPool.transform.localPosition = Vector3.zero;
+                        particleSystemPool.transform.localScale = Vector3.one;
+                        // particleSystemPool.transform.
+                    }
+                }
+            });
         }
 
         protected void RenderUpdateCallBack()
@@ -111,7 +149,7 @@ namespace Fort23.Mono
             }
         }
 
-        public void AddACurve(Vector2 startPos, Vector2 target, string itemConfig)
+        public void AddACurve(Vector2 startPos, Vector2 target, string itemConfig, System.Action finishCallBack)
         {
             ACurve aCurve = new ACurve();
             CurveInfo curveInfo = new CurveInfo();
@@ -144,6 +182,7 @@ namespace Fort23.Mono
             aCurve.CurveInfos.Add(curveInfo2);
             aCurve.CurveType = CurveType.BSL;
             ImageMove currImageMove = new ImageMove();
+            currImageMove.finishCallBack = finishCallBack;
             currImageMove.SizeCurve = AnimationCurveManager.Instance.AnimationCurveLibrary.ui_moveSize;
             currImageMove.moveSpeed = AnimationCurveManager.Instance.AnimationCurveLibrary.ui_moveSpped;
             // currImageMove.ShowSizeCurve = AnimationCurveManager.Instance.AnimationCurveLibrary.ui_showSize;
@@ -154,11 +193,8 @@ namespace Fort23.Mono
             gameObjectPool.own.SetActive(false);
             gameObjectPool.own.transform.localScale = Vector3.zero;
             currImageMove.GameObjectPool = gameObjectPool;
-            MyImage myImage= gameObjectPool.own.GetComponent<MyImage>();
-            myImage.onSpriteAlter= delegate
-            {
-                myImage.SetNativeSize();
-            };
+            MyImage myImage = gameObjectPool.own.GetComponent<MyImage>();
+            myImage.onSpriteAlter = delegate { myImage.SetNativeSize(); };
             myImage.icon_name = itemConfig;
             currImageMove.transform = gameObjectPool.own.GetComponent<RectTransform>();
             // currImageMove.transform.sizeDelta = new Vector2(35, 35);
@@ -168,11 +204,11 @@ namespace Fort23.Mono
             currImageMove.yanChi = Random.Range(0, 0.5f);
             currImageMove.speed = AnimationCurveManager.Instance.AnimationCurveLibrary.uiMoveSpeed;
             currImageMove.currAcur = aCurve;
-
             allImageMove.Add(currImageMove);
         }
 
-        public void ShowPanel(Vector2 startPos, Vector2 target, int count, string showName)
+        public void ShowPanel(Vector2 startPos, Vector2 target, int count, string showName,
+            System.Action finishCallBack = null)
         {
             if (target.x == -5000)
             {
@@ -181,7 +217,7 @@ namespace Fort23.Mono
 
             for (int i = 0; i < count; i++)
             {
-                AddACurve(startPos, target, showName);
+                AddACurve(startPos, target, showName, finishCallBack);
             }
         }
     }