随从优化

ColorlessWorld-2024-4-2/Assets/Prefab/Bullet/Bullet.prefab

@@ -9820,7 +9820,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   destination: {x: 4, y: 0.5, z: 3.16}
-  speed: 1
+  speed: 2
 --- !u!65 &8625815323164813253
 BoxCollider:
   m_ObjectHideFlags: 0

ColorlessWorld-2024-4-2/Assets/Scenes/SampleScene.unity

@@ -17543,24 +17543,45 @@ MonoBehaviour:
     value: 3
     throwRange: 3
     effectRange: 1
+    coolDown: 1
+    useTimes: 1
+    storageTimes: 1
+    currentCoolDown: 0
+    currentUseTimes: 1
+    currentStorageTimes: 1
     skillType: 4
     Icon: {fileID: -1029742972, guid: 702e3230b1367444d9d459f02db67668, type: 3}
+    coolDownIcon: {fileID: 1361041433, guid: 702e3230b1367444d9d459f02db67668, type: 3}
   - name: shoot
     disdescription: "\u653B\u51FB\u529B\u4E0D\u9AD8\u7684\u666E\u901A\u5C04\u51FB"
     effectIndex: 1
     value: 6
     throwRange: 5
     effectRange: 1
+    coolDown: 1
+    useTimes: 1
+    storageTimes: 1
+    currentCoolDown: 0
+    currentUseTimes: 1
+    currentStorageTimes: 1
     skillType: 0
     Icon: {fileID: 158022059, guid: 702e3230b1367444d9d459f02db67668, type: 3}
+    coolDownIcon: {fileID: 1361041433, guid: 702e3230b1367444d9d459f02db67668, type: 3}
   - name: magic
     disdescription: "\u67D3\u8272\u7684\u9B54\u6CD5"
     effectIndex: 2
     value: 6
     throwRange: 3
     effectRange: 1
+    coolDown: 1
+    useTimes: 1
+    storageTimes: 1
+    currentCoolDown: 0
+    currentUseTimes: 1
+    currentStorageTimes: 1
     skillType: 2
     Icon: {fileID: 158022059, guid: 702e3230b1367444d9d459f02db67668, type: 3}
+    coolDownIcon: {fileID: 1361041433, guid: 702e3230b1367444d9d459f02db67668, type: 3}
   skillNodeList: []
   skillUIPos: []
   SkillUIPrefab: {fileID: 7216391201375852461, guid: 3a10c2662334fdd459c890a6dba99b1a,

ColorlessWorld-2024-4-2/Assets/Scripts/Bullet/BulletMove.cs

@@ -26,12 +26,17 @@ public class BulletMove : MonoBehaviour
     public void MoveToDestination()
     {
        transform .position = Vector3.Lerp(startPoint, destination, time += Time.deltaTime * speed);
+
+        if(Vector3 .Distance (this .transform .position ,destination )<0.1f)
+        {
+            Destroy(this.gameObject);
+        }
     }
     private void OnTriggerEnter(Collider other)
     {
         if (other.transform.tag == "Enemy")
         {
-            Destroy(this.gameObject);
+          //  Destroy(this.gameObject);
         }
     }
     private void OnCollisionEnter(Collision collision)

ColorlessWorld-2024-4-2/Assets/Scripts/Card/TurnMaster.cs

@@ -83,8 +83,8 @@ public class TurnMaster : Singleton<TurnMaster>
             GameManager.Instance.playerState.currentStepRange = Usermanager.Instance.StepRangeCalculation(GameManager.Instance.playerState.maxStepRange);
             //恢复随从体力
             RecoverServantResource();
-            
-
+            //随从技能结算
+            SettleCoolDownSkill();
             //显示敌人攻击虚线
             EnemyManager.Instance.EnemyLine_Observer();
             //回复敌人系数
@@ -190,6 +190,28 @@ public class TurnMaster : Singleton<TurnMaster>
     {
         ServentStateManager.Instance.servant .SkillUI.SetActive(false);
     }
+    //随从技能冷却
+    public void SettleCoolDownSkill()
+    {
+        List<Servant.ServantSkill> skillList = ServentStateManager.Instance.servant.skillList;
+        foreach (Servant.ServantSkill skill  in skillList)
+        {
+            if(skill.currentStorageTimes<skill .storageTimes)
+            {
+                if(skill .currentCoolDown >0)
+                {
+                    skill.currentCoolDown--;
+                }
+
+                if (skill.currentCoolDown <= 0)
+                {
+                    skill.currentCoolDown = skill .coolDown;
+                    skill.currentStorageTimes++;
+                }
+            }
+            
+        }
+    }
 
     //老吊写的函数
     public void restoreResource(int settleTurn)

ColorlessWorld-2024-4-2/Assets/Scripts/Servent/Servant.cs

@@ -322,6 +322,11 @@ public class Servant : MonoBehaviour
             anim.transform.localScale = new Vector3(0.06f, 0.06f, 0.06f);
         }
     }
+    public void SettleSkillCoolDown()
+    {
+
+    }
+
 
     [System .Serializable ]
     public class ServantSkill
@@ -332,6 +337,13 @@ public class Servant : MonoBehaviour
         public int value;
         public int throwRange;
         public int effectRange;
+        public int coolDown;//冷却时间
+        public int useTimes;//一回合能用几次
+        public int storageTimes;//最高存几次使用
+        public int currentCoolDown;
+        public int currentUseTimes;
+        public int currentStorageTimes;
+
         public SkillType skillType;
         public enum SkillType
         {
@@ -343,5 +355,6 @@ public class Servant : MonoBehaviour
             noneRange
         }
         public Sprite Icon;
+        public Sprite coolDownIcon;
     }
 }