修改bug

Assets/Art/VFX/FXPrefabs/fx_对拼气罩 loop.prefab → Assets/Art/VFX/FXPrefabs/fx_对拼气罩_loop.prefab

@@ -24263,7 +24263,7 @@ GameObject:
   - component: {fileID: 6824492164235999667}
   m_Layer: 0
   m_HasEditorInfo: 1
-  m_Name: "fx_\u5BF9\u62FC\u6C14\u7F69 loop"
+  m_Name: "fx_\u5BF9\u62FC\u6C14\u7F69_loop"
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0

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

@@ -116,6 +116,11 @@ namespace GameLogic.Combat.CombatTool
             LateUpdate(t);
         }
 
+        private void TriggerCombat()
+        {
+            
+        }
+
         public void LateUpdate(float t)
         {
             CombatHeroController.LateUpdate(t);

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

@@ -82,6 +82,10 @@ namespace GameLogic.Combat.CombatTool
             combatMagicWeaponEntity.CombatAIBasic.ChangeState(CombatHeroStateType.Active);
         }
 
+        public void TriggerMagicWeapon(CombatMagicWeaponEntity a,CombatMagicWeaponEntity b)
+        {
+            
+        }
 
         public void Update(float t)
         {

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

@@ -1,6 +1,7 @@
 using Core.State;
 using Core.Triiger;
 using Fort23.Core;
+using Fort23.UTool;
 using GameLogic.Combat.CombatTool;
 using OfficeOpenXml.FormulaParsing.Excel.Functions.Logical;
 using UnityEngine;
@@ -16,6 +17,7 @@ namespace GameLogic.Combat.Hero.State
         {
             public bool trigger;
             public float triggerTime;
+
             public override void ActiveObj()
             {
             }
@@ -24,6 +26,7 @@ namespace GameLogic.Combat.Hero.State
             {
             }
         }
+
         private CombatMagicWeaponEntity myCombatMagicWeaponEntity;
 
         private float speed = 10;
@@ -42,7 +45,7 @@ namespace GameLogic.Combat.Hero.State
 
         protected override void ProEnter()
         {
-            MagicWeaponMoveStateData magicWeaponMoveStateData=   iStateEnterData as MagicWeaponMoveStateData;
+            MagicWeaponMoveStateData magicWeaponMoveStateData = iStateEnterData as MagicWeaponMoveStateData;
             if (magicWeaponMoveStateData != null)
             {
                 _trigger = magicWeaponMoveStateData.trigger;
@@ -85,6 +88,16 @@ namespace GameLogic.Combat.Hero.State
             }
             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;

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

@@ -1,5 +1,7 @@
 using Core.State;
 using Fort23.Core;
+using Fort23.UTool;
+using GameLogic.Combat.CombatTool;
 using UnityEngine;
 
 namespace GameLogic.Combat.Hero.State
@@ -29,6 +31,8 @@ namespace GameLogic.Combat.Hero.State
 
         private MagicWeaponPingDouData _magicWeaponPingDouData;
 
+        private ParticleSystemPool _particleSystemPool1;
+        private ParticleSystemPool _particleSystemPool2;
         public MagicWeaponPingDouState(CombatHeroEntity combatHeroEntity) : base(combatHeroEntity)
         {
             myCombatMagicWeaponEntity = combatHeroEntity as CombatMagicWeaponEntity;
@@ -36,6 +40,20 @@ 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;
+                });
         }
 
 
@@ -45,6 +63,10 @@ namespace GameLogic.Combat.Hero.State
 
         protected override void ProExit()
         {
+            GObjectPool.Instance.Recycle(_particleSystemPool1);
+            GObjectPool.Instance.Recycle(_particleSystemPool2);
+            _particleSystemPool1 = null;
+            _particleSystemPool2 = null;
         }
 
         public override bool IsUpdateLockTarget()

UserSettings/EditorUserSettings.asset

@@ -36,19 +36,19 @@ EditorUserSettings:
       value: 5701555f5d02585f09575a7246755a44454f4e287b2a75607c7f4c6ab0e5376d
       flags: 0
     RecentlyUsedSceneGuid-5:
-      value: 5753045f5d005b5f0b0a082315715d44464e4b7b797125622e284430bbe66d68
+      value: 055303045d535e5d54080e721672094412154e7b757c71342e794b65b2e4616f
       flags: 0
     RecentlyUsedSceneGuid-6:
-      value: 055303045d535e5d54080e721672094412154e7b757c71342e794b65b2e4616f
+      value: 52570c02000d5e025a58597212725c4440161c2e797a75607f2c4467b7b3323e
       flags: 0
     RecentlyUsedSceneGuid-7:
-      value: 52035153040d5d0f5f5f0f21117a0744154f4e79282d70357a2b4f61e6e4656a
+      value: 545007550304585a545d5e76157b0844454f1b7a2d2c7666782f4961b7b9623b
       flags: 0
     RecentlyUsedSceneGuid-8:
-      value: 545007550304585a545d5e76157b0844454f1b7a2d2c7666782f4961b7b9623b
+      value: 52035153040d5d0f5f5f0f21117a0744154f4e79282d70357a2b4f61e6e4656a
       flags: 0
     RecentlyUsedSceneGuid-9:
-      value: 52570c02000d5e025a58597212725c4440161c2e797a75607f2c4467b7b3323e
+      value: 5753045f5d005b5f0b0a082315715d44464e4b7b797125622e284430bbe66d68
       flags: 0
     Systems Window:
       value: 183b144645154b7802000a2b17364d11021e17246e72662b47695d73a2a07478a2a505e1e82d6f2f100cca3210371526d1051c05e22a040f2507f00b32f01c061ccb5a9f5ace1e10d81c50a48d5d91a3959694aa9ad8efd7c9f2afe0f1c0fcfdf6f8b6f2a5a6dacfb89debbfa1cbc9c3f5c3bac18e9c89c1bbdec2d6f2b992939996c59699c79ae8d182b7baad82aba0b0aea88398abdbf1dd8a8ea765ffc520262728fafcf8f6c28eb162945c71898d6167877a72a980809c9f71cecece859d579fd5f106dbdadb21de0dde237c686c76706641634c764f547c624a7e622d6628286620686f653d2b635a0204003e0805017509093043470e3643041c5d5b415c54450e1c424b420f6e4b634e636263696655641a1f273c0f083c1102ec362de62318e9ea25ab61ade8ed0ee30655b0b6b7b8176615

XiuXianGame.sln.DotSettings.user

@@ -1,3 +1,4 @@
 <wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
+	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003ACollider_002Ecs_002Fl_003AC_0021_003FUsers_003FAdministrator_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F2193ba18cb0546b2832917f7674384cf20000_003F3a_003Fa0da6a1e_003FCollider_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AThrowHelper_002Ecs_002Fl_003AC_0021_003FUsers_003Fck_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E2_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003Fe4df6db7850b4c40b72002ff5da8188846ac00_003F3b_003F1a234af4_003FThrowHelper_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AVector3_002Ecs_002Fl_003AC_0021_003FUsers_003Fck_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E2_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F2008d2d6093f4149aaeafd5f414aa7a517c400_003Fd3_003F23d17a83_003FVector3_002Ecs/@EntryIndexedValue">ForceIncluded</s:String></wpf:ResourceDictionary>