适配 菈乌玛退队后队伍UI不会还原，但是跨地图传送后UI还原 的场景

Author: huiyadanli

BetterGenshinImpact/GameTask/AutoFight/Model/Avatar.cs

@@ -175,6 +175,21 @@ public void Switch()
                     break;
             }
 
+            // 6.0 特殊逻辑
+            if (i > 3 && CombatScenes.IndexRectOffset60Fix)
+            {
+                // 3次失败考虑是否偏移出现问题，修改偏移位置
+                // 只有 草露 角色离队，然后跨地图传送后，会出现这个场景。也就是只有 偏移 -> 原始 的场景
+                foreach (var avatar in CombatScenes.GetAvatars())
+                {
+                    var rect1 = avatar.IndexRect;
+                    rect1.Y += 14;
+                    avatar.IndexRect = rect1;
+                }
+
+                CombatScenes.IndexRectOffset60Fix = false;
+            }
+
             // Debug.WriteLine($"切换到{Index}号位");
             // Cv2.ImWrite($"log/切换.png", region.SrcMat);
             Sleep(250, Ct);
@@ -294,19 +309,23 @@ public bool IsActive(ImageRegion region)
         }
         else
         {
-            // 剪裁出IndexRect区域
-            var indexRa = region.DeriveCrop(IndexRect);
-            // Cv2.ImWrite($"log/indexRa_{Name}.png", indexRa.SrcMat);
-            var count = OpenCvCommonHelper.CountGrayMatColor(indexRa.CacheGreyMat, 251, 255);
-            if (count * 1.0 / (IndexRect.Width * IndexRect.Height) > 0.5)
-            {
-                return false;
-            }
-            else
-            {
-                return true;
-            }
+            var white = IsIndexRectWhite(region, IndexRect);
+            return !white;
+        }
+    }
+    
+    private bool IsIndexRectWhite(ImageRegion region, Rect rect)
+    {
+        // 剪裁出IndexRect区域
+        var indexRa = region.DeriveCrop(rect);
+        var mat = indexRa.CacheGreyMat;
+        var count = OpenCvCommonHelper.CountGrayMatColor(mat, 251, 255);
+        if (count * 1.0 / (mat.Width * mat.Height) > 0.5)
+        {
+            return true;
         }
+
+        return false;
     }
 
     /// <summary>

BetterGenshinImpact/GameTask/AutoFight/Model/CombatScenes.cs

@@ -40,6 +40,12 @@ public class CombatScenes : IDisposable
         App.ServiceProvider.GetRequiredService<BgiOnnxFactory>().CreateYoloPredictor(BgiOnnxModel.BgiAvatarSide);
 
     public int ExpectedTeamAvatarNum { get; private set; } = 4;
+    
+        
+    /// <summary>
+    /// 6.0 UI偏移标识
+    /// </summary>
+    public bool IndexRectOffset60Fix { get; set; }
 
     /// <summary>
     /// 获取一个只读的Avatars
@@ -102,7 +108,7 @@ public CombatScenes InitializeTeam(ImageRegion imageRegion)
         }
 
         // 6.0 版本 队伍下的 草露 进度条 导致位置偏移
-        AvatarSideFixOffset(imageRegion, avatarSideIconRectList, avatarIndexRectList);
+        IndexRectOffset60Fix = AvatarSideFixOffset(imageRegion, avatarSideIconRectList, avatarIndexRectList);
 
         // 识别队伍
         var names = new string[avatarSideIconRectList.Count];
@@ -148,7 +154,7 @@ public CombatScenes InitializeTeam(ImageRegion imageRegion)
     /// <param name="imageRegion"></param>
     /// <param name="avatarSideIconRectList"></param>
     /// <param name="avatarIndexRectList"></param>
-    public void AvatarSideFixOffset(ImageRegion imageRegion, List<Rect> avatarSideIconRectList, List<Rect> avatarIndexRectList)
+    public bool AvatarSideFixOffset(ImageRegion imageRegion, List<Rect> avatarSideIconRectList, List<Rect> avatarIndexRectList)
     {
         // 角色序号 左上角 坐标偏移（+2, -5）后存在3个白色点，则认为存在 草露 进度条
         // 存在 草露 进度条时候整体上移 14 个像素
@@ -180,7 +186,11 @@ public void AvatarSideFixOffset(ImageRegion imageRegion, List<Rect> avatarSideIc
                 rect.Y -= 14;
                 avatarIndexRectList[i] = rect;
             }
+
+            return true;
         }
+
+        return false;
     }