From bface07b5ea879e40f5be8d082bfa77fb873b0bd Mon Sep 17 00:00:00 2001
From: yyl <yyl>
Date: 星期四, 15 一月 2026 18:07:44 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.1.20:10010/r/Project_SG_scripts

---
 Main/System/Guild/GuildBossWin.cs |   34 ++++++++++++++++++++++++++--------
 1 files changed, 26 insertions(+), 8 deletions(-)

diff --git a/Main/System/Guild/GuildBossWin.cs b/Main/System/Guild/GuildBossWin.cs
index 09fbbb1..cc6741c 100644
--- a/Main/System/Guild/GuildBossWin.cs
+++ b/Main/System/Guild/GuildBossWin.cs
@@ -74,6 +74,16 @@
     [SerializeField] Transform fakeRedBZ;
     [SerializeField] Transform fakeRedAward;
 
+    [Header("姝﹀皢杩涘満鏃堕棿")]
+    public float heroShowTime = 0.1f;
+    [Header("姝﹀皢鏀诲嚮閫熷害瓒婂ぇ瓒婂揩")]
+    public float heroAtkSpeed = 2f;
+    [Header("澶氭椋樿浠ュ強鐗╁搧鍑虹幇闂撮殧姣")]
+    public int atkValueShowCD = 200;
+
+    [Header("鏄惁寰幆鎾斁浠栦汉鎴樻枟")]
+    public bool isOthersLoop = false;
+
     bool isCD = false;
 
     int beforeLayerNum; //甯冮樀灞傜骇 瀵规瘮鍙樺寲灞曠ず鐗规晥
@@ -383,7 +393,7 @@
         }
 
         GuildBossManager.Instance.TaofaBoss(0);
-        ShowAttackCD().Forget();
+        // ShowAttackCD().Forget();
     }
 
     async UniTask ShowAttackCD()
@@ -404,6 +414,7 @@
         ShowDynamicUI();
     }
 
+
     void AtkResultEvent()
     {
         //1. 鐜╁浠巔os1 绉诲姩鍒皃os2
@@ -412,7 +423,7 @@
         heroModel.GetHero().onComplete = null;
         heroModel.PlayAnimation("run", true);
         heroModel.transform.localPosition = pos1.localPosition;
-        heroModel.transform.DOLocalMove(pos2.localPosition, 0.3f).OnComplete(() =>
+        heroModel.transform.DOLocalMove(pos2.localPosition, heroShowTime).OnComplete(() =>
         {
             ShowDmg().Forget();
         });
@@ -426,6 +437,7 @@
             heroModel.transform.localPosition = pos1.localPosition;
         };
         heroModel.HeroPlay("attack");
+        
         if (GuildBossManager.Instance.atkResult.AtkType == 0)
         {
             hurtEffect.Play();
@@ -463,7 +475,7 @@
                     attackType = hurtData.IsSuper == 1 ? (int)DamageType.CritDamage : 2
                 };
                 hurtValues[i].text = BattleUtility.DisplayDamageNum(dmg);
-                await UniTask.Delay(200);
+                await UniTask.Delay(atkValueShowCD);
             }
             else
             {
@@ -491,7 +503,7 @@
 
                 awardValues[i].text = itemData.Count.ToString();
                 awardIcons[i].SetItemSprite((int)itemData.ItemID);
-                await UniTask.Delay(200);
+                await UniTask.Delay(atkValueShowCD);
             }
             else
             {
@@ -505,6 +517,7 @@
     {
         var skinConfig = HorseSkinConfig.Get(HorseManager.Instance.GetUsingHorseSkinID(false));
         heroModel.Create(skinConfig.SkinID, PhantasmPavilionManager.Instance.GetMyModelSkinID(), 1.2f);
+        heroModel.GetHero().SetSpeed(heroAtkSpeed);
         for (int i = 0; i < hurtValues.Length; i++)
         {
             hurtValues[i].transform.localScale = Vector3.zero;
@@ -646,11 +659,16 @@
         int index = keys.IndexOf(GuildBossManager.Instance.lastPlayTick) + 1;
         if (index >= keys.Count)
         {
-            index = 0;
+            index = isOthersLoop ? 0 : -1;  //鏄惁寰幆鎾斁
         }
-        GuildBossManager.Instance.lastPlayTick = keys[index];
-        var atkData = GuildBossManager.Instance.taofaAtkData[keys[index]];
-        var atkPlayerID = atkData.playerID;
+        int atkPlayerID = 0;
+        TaofaAtkData atkData = null;
+        if (index >= 0)
+        {
+            GuildBossManager.Instance.lastPlayTick = keys[index];
+            atkData = GuildBossManager.Instance.taofaAtkData[keys[index]];
+            atkPlayerID = atkData.playerID;
+        }
         for (int i = 0; i < otherPlayers.Count; i++)
         {
             if (!otherPlayers[i].isActiveAndEnabled)

--
Gitblit v1.8.0