更新屎山

00-Other/NewDuty.cs

@@ -24,19 +24,20 @@ using FFXIVClientStructs.FFXIV.Component.GUI;
 
 namespace NewDuty;
 
-[ScriptType(guid: "80890eac-4730-4708-ad1b-05aba469c2a1", name: "最新最热临时绘制", territorys: [1307, 1346],
-    version: "0.0.1.5", author: "Tetora", note: noteStr)]
+[ScriptType(guid: "80890eac-4730-4708-ad1b-05aba469c2a1", name: "最新最热临时绘制", territorys: [1307, 1346, 1339, 1340, 1341, 1342, 1343],
+    version: "0.0.1.6", author: "Tetora", note: noteStr)]
 
 /* MapID
  * 1307: 格莱杨拉波尔歼灭战
  * 1346：新月岛北征
+ * 1339~1343 斗兽奇弈
  */
 
 public class NewDuty
 {
     const string noteStr =
         """
-        v0.0.1.5:
+        v0.0.1.6:
         最新最热副本绘制，可能会电，介意请关闭
         别人的正式版发了这边就删
         """;
@@ -81,6 +82,132 @@ public class NewDuty
     
     #endregion
     
+    #region 斗兽奇弈
+    
+    [ScriptMethod(name: "—————— 斗兽奇弈 ——————", eventType: EventTypeEnum.StartCasting, eventCondition: ["ActionId:"])]
+    public void 斗兽奇弈(Event @event, ScriptAccessory accessory) { }
+    
+    [ScriptMethod(name: "奇子·主教_死亡螺旋（月环）", eventType: EventTypeEnum.StartCasting, eventCondition: ["ActionId:regex:^46868$"])]
+    public void 主教_死亡螺旋(Event @event, ScriptAccessory accessory)
+    {
+        // if (isText)accessory.Method.TextInfo($"靠近主教月环", duration: 5000, true);
+        if (isTTS)accessory.Method.TTS($"靠近主教月环");
+        if (isEdgeTTS)accessory.Method.EdgeTTS($"靠近主教月环");
+        
+        var dp = accessory.Data.GetDefaultDrawProperties();
+        dp.Name = $"死亡螺旋{@event.SourceId}";
+        dp.Color = accessory.Data.DefaultDangerColor;
+        dp.Owner = @event.SourceId();
+        dp.Scale = new Vector2(40f);
+        dp.InnerScale = new Vector2(4f);
+        dp.Radian = float.Pi * 2;
+        dp.DestoryAt = 5700;
+        accessory.Method.SendDraw(DrawModeEnum.Default, DrawTypeEnum.Donut, dp);
+    }
+    
+    [ScriptMethod(name: "奇子·骑士_骨化（打断提示）", eventType: EventTypeEnum.StartCasting, eventCondition: ["ActionId:regex:^46871$"])]
+    public void 骑士_骨化(Event @event, ScriptAccessory accessory)
+    {
+        if (isText)accessory.Method.TextInfo($"打断骑士伤害提高（控制或借用-咒具碎魂）", duration: 7000, false);
+        if (isTTS)accessory.Method.TTS($"打断骑士");
+        if (isEdgeTTS)accessory.Method.EdgeTTS($"打断骑士");
+    }
+    
+    [ScriptMethod(name: "奇子·骑士_物理伤害提高（驱散提示）", eventType: EventTypeEnum.StatusAdd, eventCondition: ["StatusID:regex:^2074$","TargetName:regex:^奇子·骑士$"])]
+    public void 骑士_物理伤害提高(Event @event, ScriptAccessory accessory)
+    {
+        if (isText)accessory.Method.TextInfo($"驱散骑士（借用-水栖波）", duration: 5000, false);
+        if (isTTS)accessory.Method.TTS($"驱散骑士");
+        if (isEdgeTTS)accessory.Method.EdgeTTS($"驱散骑士");
+    }
+    
+    [ScriptMethod(name: "奇子·主教_古代疾风（面前直线）", eventType: EventTypeEnum.StartCasting, eventCondition: ["ActionId:regex:^46870$"])]
+    public void 主教_古代疾风(Event @event, ScriptAccessory accessory)
+    {
+        var dp = accessory.Data.GetDefaultDrawProperties();
+        dp.Name = $"古代疾风{@event.SourceId}";
+        dp.Color = accessory.Data.DefaultDangerColor;
+        dp.Owner = @event.SourceId();
+        dp.Scale = new (8f, 40f);
+        dp.DestoryAt = 5700;
+        accessory.Method.SendDraw(DrawModeEnum.Default, DrawTypeEnum.Rect, dp); 
+    }
+    
+    [ScriptMethod(name: "奇子·骑士_前线护卫（魔兽吸引注意提示）", eventType: EventTypeEnum.StartCasting, eventCondition: ["ActionId:regex:^46864$"])]
+    public void 骑士_前线护卫(Event @event, ScriptAccessory accessory)
+    {
+        if (isText)accessory.Method.TextInfo($"使用魔兽技 [吸引注意]", duration: 4000, true);
+        if (isTTS)accessory.Method.TTS($"使用魔兽吸引注意");
+        if (isEdgeTTS)accessory.Method.EdgeTTS($"使用魔兽吸引注意");
+    }
+    
+    [ScriptMethod(name: "奇子·骑士_古墓（钢铁）", eventType: EventTypeEnum.StartCasting, eventCondition: ["ActionId:regex:^46866$"])]
+    public void 骑士_古墓(Event @event, ScriptAccessory accessory)
+    {
+        if (isTTS)accessory.Method.TTS($"远离骑士");
+        if (isEdgeTTS)accessory.Method.EdgeTTS($"远离骑士");
+        
+        var dp = accessory.Data.GetDefaultDrawProperties();
+        dp.Name = $"古墓{@event.SourceId}";
+        dp.Color = accessory.Data.DefaultDangerColor;
+        dp.Owner = @event.SourceId();
+        dp.Scale = new Vector2(6f);
+        dp.DestoryAt = 4700;
+        accessory.Method.SendDraw(DrawModeEnum.Default, DrawTypeEnum.Circle, dp);
+    }
+    
+    [ScriptMethod(name: "魅惑女妖 帕德索_血雨（钢铁）", eventType: EventTypeEnum.StartCasting, eventCondition: ["ActionId:regex:^46926$"])]
+    public void 帕德索_血雨钢铁(Event @event, ScriptAccessory accessory)
+    {
+        // if (isText)accessory.Method.TextInfo($"远离", duration: 5000, true);
+        if (isTTS)accessory.Method.TTS($"远离");
+        if (isEdgeTTS)accessory.Method.EdgeTTS($"远离");
+        
+        var dp = accessory.Data.GetDefaultDrawProperties();
+        dp.Name = $"血雨钢铁{@event.SourceId}";
+        dp.Color = accessory.Data.DefaultDangerColor;
+        dp.Owner = @event.SourceId();
+        dp.Scale = new Vector2(8f);
+        dp.DestoryAt = 5700;
+        accessory.Method.SendDraw(DrawModeEnum.Default, DrawTypeEnum.Circle, dp);
+    }
+    
+    [ScriptMethod(name: "魅惑女妖 帕德索_血雨（月环）", eventType: EventTypeEnum.StartCasting, eventCondition: ["ActionId:regex:^46924$"])]
+    public void 帕德索_血雨(Event @event, ScriptAccessory accessory)
+    {
+        // if (isText)accessory.Method.TextInfo($"靠近月环", duration: 5000, true);
+        if (isTTS)accessory.Method.TTS($"靠近月环");
+        if (isEdgeTTS)accessory.Method.EdgeTTS($"靠近月环");
+        
+        var dp = accessory.Data.GetDefaultDrawProperties();
+        dp.Name = $"血雨月环{@event.SourceId}";
+        dp.Color = accessory.Data.DefaultDangerColor;
+        dp.Owner = @event.SourceId();
+        dp.Scale = new Vector2(40f);
+        dp.InnerScale = new Vector2(8f);
+        dp.Radian = float.Pi * 2;
+        dp.DestoryAt = 5700;
+        accessory.Method.SendDraw(DrawModeEnum.Default, DrawTypeEnum.Donut, dp);
+    }
+    
+    [ScriptMethod(name: "魅惑女妖 帕德索_虚空烈风（面前直线）", eventType: EventTypeEnum.StartCasting, eventCondition: ["ActionId:regex:^46932$"])]
+    public void 帕德索_虚空烈风(Event @event, ScriptAccessory accessory)
+    {
+        var dp = accessory.Data.GetDefaultDrawProperties();
+        dp.Name = $"虚空烈风{@event.SourceId}";
+        dp.Color = accessory.Data.DefaultDangerColor;
+        dp.Owner = @event.SourceId();
+        dp.Scale = new (8f, 60f);
+        dp.DestoryAt = 3700;
+        accessory.Method.SendDraw(DrawModeEnum.Default, DrawTypeEnum.Rect, dp); 
+    }
+    
+    // 46935 寒毒接触 上毒
+    // 46928 奇子·梦魔法师 > BOSS 盲信（伤害提高 1225
+    // 46936 欺瞒雾 附加噩梦？ 召唤两个连线爱心[信息素 DataId:19347] 随后释放 24m钢铁[46938 碎裂]
+    
+    #endregion
+    
     #region 蜃景幻界新月岛 北征之章
 
     [ScriptMethod(name: "—————— 蜃景幻界新月岛 北征之章 ——————", eventType: EventTypeEnum.StartCasting, eventCondition: ["ActionId:"])]
@@ -911,7 +1038,6 @@ public class NewDuty
     
     
     #endregion
-
     
     #region  7.4 格莱杨拉波尔歼灭战
     

OnlineRepo.json

@@ -968,15 +968,20 @@
   {
     "Name": "最新最热临时绘制",
     "Guid": "80890eac-4730-4708-ad1b-05aba469c2a1",
-    "Version": "0.0.1.5",
+    "Version": "0.0.1.6",
     "Author": "Tetora",
     "Repo": "https://github.com/Hibiya615/TetoraKAScript/tree/main",
     "DownloadUrl": "https://raw.githubusercontent.com/Hibiya615/TetoraKAScript/refs/heads/main/00-Other/NewDuty.cs",
-    "Note": "v0.0.1.5:\r\n最新最热副本绘制，可能会电，介意请关闭\r\n别人的正式版发了这边就删",
-    "UpdateInfo": "0.0.1.5: 删除魔之塔与超魔之塔绘制，请支持Coda",
+    "Note": "v0.0.1.6:\r\n最新最热副本绘制，可能会电，介意请关闭\r\n别人的正式版发了这边就删",
+    "UpdateInfo": "0.0.1.6: 添加斗兽奇弈绘制模板，魔之塔绘制请支持Coda",
     "TerritoryIds": [
       1307,
-      1346
+      1346, 
+      1339, 
+      1340, 
+      1341, 
+      1342, 
+      1343
     ]
   }
 ]

PVP/PVPAction.cs

@@ -181,7 +181,7 @@ public class PVPAction
         if (@event.TargetId() != accessory.Data.Me) return;
         var dp = accessory.Data.GetDefaultDrawProperties();
         dp.Name = "冲天Self内圈";
-        dp.Color = new Vector4(0f, 1f, 1f, 0.5f);
+        dp.Color = new Vector4(0f, 1f, 1f, 0.8f);
         dp.Owner = @event.SourceId();
         dp.Scale = new Vector2(5f);
         dp.DestoryAt = 5000;
@@ -189,7 +189,7 @@ public class PVPAction
         
         var dp1 = accessory.Data.GetDefaultDrawProperties();
         dp1.Name = "冲天Self外圈";
-        dp1.Color = new Vector4(0f, 1f, 1f, 0.3f);
+        dp1.Color = new Vector4(0f, 1f, 1f, 0.8f);
         dp1.Owner = @event.SourceId();
         dp1.Scale = new Vector2(10f);
         dp1.DestoryAt = 5000;
@@ -200,10 +200,20 @@ public class PVPAction
         dp2.Color = new Vector4(0f, 1f, 1f, 10f);
         dp2.Owner = @event.SourceId();
         dp2.Scale = new Vector2(5f);
-        dp2.InnerScale = new Vector2(4.95f);
+        dp2.InnerScale = new Vector2(4.9f);
         dp2.Radian = float.Pi * 2;
         dp2.DestoryAt = 5000;
         accessory.Method.SendDraw(DrawModeEnum.Default, DrawTypeEnum.Donut, dp2);
+        
+        var dp3 = accessory.Data.GetDefaultDrawProperties();
+        dp3.Name = $"冲天Self外圈描边";
+        dp3.Color = new Vector4(0f, 1f, 1f, 5f);
+        dp3.Owner = @event.SourceId();
+        dp3.Scale = new Vector2(10f);
+        dp3.InnerScale = new Vector2(9.94f);
+        dp3.Radian = float.Pi * 2;
+        dp3.DestoryAt = 5000;
+        accessory.Method.SendDraw(DrawModeEnum.Default, DrawTypeEnum.Donut, dp3);
     }
     
     [ScriptMethod(name: "自身冲天销毁", eventType: EventTypeEnum.StatusRemove, eventCondition: ["StatusID:3180"],userControl: false)]
@@ -228,6 +238,8 @@ public class PVPAction
         dp.Owner = @event.SourceId();
         dp.Scale = new Vector2(10f);
         dp.DestoryAt = 5000;
+        dp.FadeDistance = 40f;
+        dp.FadeCentreObject = accessory.Data.Me;
         accessory.Method.SendDraw(DrawModeEnum.Default, DrawTypeEnum.Circle, dp);
         }
     }
@@ -254,6 +266,8 @@ public class PVPAction
                 dp.Owner = @event.SourceId();
                 dp.Scale = new Vector2(5f);
                 dp.DestoryAt = 5000;
+                dp.FadeDistance = 30f;
+                dp.FadeCentreObject = accessory.Data.Me;
                 accessory.Method.SendDraw(DrawModeEnum.Default, DrawTypeEnum.Circle, dp);
 
                 var dp1 = accessory.Data.GetDefaultDrawProperties();
@@ -262,6 +276,8 @@ public class PVPAction
                 dp1.Owner = @event.SourceId();
                 dp1.Scale = new Vector2(10f);
                 dp1.DestoryAt = 5000;
+                dp1.FadeDistance = 40f;
+                dp1.FadeCentreObject = accessory.Data.Me;
                 accessory.Method.SendDraw(DrawModeEnum.Default, DrawTypeEnum.Circle, dp1);
                 
                 var dp2 = accessory.Data.GetDefaultDrawProperties();
@@ -272,6 +288,8 @@ public class PVPAction
                 dp2.InnerScale = new Vector2(4.94f);
                 dp2.Radian = float.Pi * 2;
                 dp2.DestoryAt = 5000;
+                dp2.FadeDistance = 30f;
+                dp2.FadeCentreObject = accessory.Data.Me;
                 accessory.Method.SendDraw(DrawModeEnum.Default, DrawTypeEnum.Donut, dp2);
             }
     }
@@ -301,6 +319,8 @@ public class PVPAction
                     dp.Owner = @event.SourceId();
                     dp.Scale = new Vector2(5f);
                     dp.DestoryAt = 5000;
+                    dp.FadeDistance = 40f;
+                    dp.FadeCentreObject = accessory.Data.Me;
                     accessory.Method.SendDraw(DrawModeEnum.Default, DrawTypeEnum.Circle, dp);
 
                     var dp1 = accessory.Data.GetDefaultDrawProperties();
@@ -309,6 +329,8 @@ public class PVPAction
                     dp1.Owner = @event.SourceId();
                     dp1.Scale = new Vector2(10f);
                     dp1.DestoryAt = 5000;
+                    dp1.FadeDistance = 50f;
+                    dp1.FadeCentreObject = accessory.Data.Me;
                     accessory.Method.SendDraw(DrawModeEnum.Default, DrawTypeEnum.Circle, dp1);
                     
                     var dp2 = accessory.Data.GetDefaultDrawProperties();
@@ -319,6 +341,8 @@ public class PVPAction
                     dp2.InnerScale = new Vector2(4.94f);
                     dp2.Radian = float.Pi * 2;
                     dp2.DestoryAt = 5000;
+                    dp2.FadeDistance = 40f;
+                    dp2.FadeCentreObject = accessory.Data.Me;
                     accessory.Method.SendDraw(DrawModeEnum.Default, DrawTypeEnum.Donut, dp2);
                 }
             }
@@ -384,6 +408,8 @@ public class PVPAction
             dp.ScaleMode |= ScaleMode.YByDistance;
             dp.Scale = new(1);
             dp.DestoryAt = 500;
+            dp.FadeDistance = 50f;
+            dp.FadeCentreObject = accessory.Data.Me;
             accessory.Method.SendDraw(DrawModeEnum.Imgui, DrawTypeEnum.Displacement, dp);
         }
     }
@@ -399,7 +425,6 @@ public class PVPAction
         }
     }
     
-
     [ScriptMethod(name: "小队中庸之道绘制销毁", eventType: EventTypeEnum.StatusRemove, eventCondition: ["StatusID:3118"],userControl: false)]
     public void 小队中庸之道绘制销毁(Event @event, ScriptAccessory accessory)
     {
@@ -410,7 +435,6 @@ public class PVPAction
         }
     }
 
-
     [ScriptMethod(name: "敌方中庸之道绘制", eventType: EventTypeEnum.ActionEffect, eventCondition: ["ActionId:regex:^2926[67]"])]
     public void MesotesEnmity(Event @event, ScriptAccessory accessory)
     {
@@ -505,7 +529,7 @@ public class PVPAction
         {
             var dp = accessory.Data.GetDefaultDrawProperties();
             dp.Name = $"小队象式浮空炮塔{@event.SourceId()}";
-            dp.Color = accessory.Data.DefaultSafeColor.WithW(0.6f);
+            dp.Color = accessory.Data.DefaultSafeColor.WithW(0.25f);
             dp.Position = @event.EffectPosition();
             dp.Scale = new Vector2(5f);
             dp.DestoryAt = 10000;
@@ -530,7 +554,7 @@ public class PVPAction
         {
             var dp = accessory.Data.GetDefaultDrawProperties();
             dp.Name = $"敌方象式浮空炮塔{@event.SourceId()}";
-            dp.Color = new Vector4(1f, 0f, 0f, 0.6f);
+            dp.Color = new Vector4(1f, 0f, 0f, 0.25f);
             dp.Position = @event.EffectPosition();
             dp.Scale = new Vector2(5f);
             dp.DestoryAt = 10000;
@@ -690,7 +714,7 @@ public class PVPAction
     [ScriptMethod(name: "敌方圣盾阵范围绘制", eventType: EventTypeEnum.StatusAdd, eventCondition: ["StatusID:3026"])]
     public void HolySheltronEnmity(Event @event, ScriptAccessory accessory)
     {
-        // if (isOnlyMark) return; // 没开启仅标记选项，绘制对方全部
+         // if (isOnlyMark) return; // 没开启仅标记选项，绘制对方全部
             var obj = IbcHelper.GetById(accessory, @event.SourceId);
             if (obj == null || !obj.IsValid()) return;
             if (obj == accessory.Data.MyObject) return;
@@ -703,6 +727,8 @@ public class PVPAction
                 dp.Owner = @event.SourceId();
                 dp.Scale = new Vector2(6f);
                 dp.DestoryAt = 4000;
+                dp.FadeDistance = 50f;
+                dp.FadeCentreObject = accessory.Data.Me;
                 accessory.Method.SendDraw(DrawModeEnum.Default, DrawTypeEnum.Circle, dp);
             }
     }
@@ -754,7 +780,7 @@ public class PVPAction
    [ScriptMethod(name: "自身蛇鳞击", eventType: EventTypeEnum.StatusAdd, eventCondition: ["StatusID:regex:^409[78]$"])]
     public void ArmoredScales_Backlash_Self(Event @event, ScriptAccessory accessory)
     {
-        // StatusID: 4096 蛇鳞 ; 4097 蛇鳞甲 ; 4098 蛇血
+        // StatusID: 4096 蛇鳞 ; 4097 蛇鳞甲 ; 4098 蛇血 , 蛇鳞为减伤与免控buff，蛇鳞甲为血盾，蛇血为破盾后的蛇鳞击技能加成
         if (@event.TargetId() != accessory.Data.Me) return; 
         switch (@event.StatusID())
         {
@@ -794,6 +820,13 @@ public class PVPAction
         accessory.Method.RemoveDraw($".*蛇鳞击Self");
     }
     
+    [ScriptMethod(name: "蛇血销毁", eventType: EventTypeEnum.StatusRemove, eventCondition: ["StatusID:regex:^4098$"],userControl: false)]
+    public void ArmoredScales_SnakesBane_RemoveSelf(Event @event, ScriptAccessory accessory)
+    {
+        if (@event.TargetId() != accessory.Data.Me) return; 
+        accessory.Method.RemoveDraw($".*蛇鳞击Self");
+    }
+    
     [ScriptMethod(name: "敌方蛇鳞击范围绘制", eventType: EventTypeEnum.StatusAdd, eventCondition: ["StatusID:regex:^409[78]$"])]
     public void ArmoredScales_Backlash_Enmity(Event @event, ScriptAccessory accessory)
     {
@@ -809,19 +842,23 @@ public class PVPAction
                     case 4097:
                         var dp = accessory.Data.GetDefaultDrawProperties();
                         dp.Name = $"蛇鳞击敌方{@event.SourceId}";
-                        dp.Color = new Vector4(1f, 0f, 0f, 0.55f);
+                        dp.Color = new Vector4(1f, 0f, 0f, 0.5f);
                         dp.Owner = @event.SourceId();
                         dp.Scale = new Vector2(6f);
                         dp.DestoryAt = 4000;
+                        dp.FadeDistance = 30f;
+                        dp.FadeCentreObject = accessory.Data.Me;
                         accessory.Method.SendDraw(DrawModeEnum.Default, DrawTypeEnum.Circle, dp);
                         break;
                     case 4098:
                         var dp1 = accessory.Data.GetDefaultDrawProperties();
                         dp1.Name = $"血气蛇鳞击敌方{@event.SourceId}";
-                        dp1.Color = new Vector4(1f, 0f, 0f, 0.35f);
+                        dp1.Color = new Vector4(1f, 0f, 0f, 0.3f);
                         dp1.Owner = @event.SourceId();
                         dp1.Scale = new Vector2(15f);
-                        dp1.DestoryAt = 4000;
+                        dp1.DestoryAt = 4000;     
+                        dp1.FadeDistance = 40f;
+                        dp1.FadeCentreObject = accessory.Data.Me;
                         accessory.Method.SendDraw(DrawModeEnum.Default, DrawTypeEnum.Circle, dp1);
                         break;
                 }
@@ -839,6 +876,12 @@ public class PVPAction
     {
         accessory.Method.RemoveDraw($".*蛇鳞击敌方{@event.SourceId()}");
     }
+    
+    [ScriptMethod(name: "敌方蛇血销毁", eventType: EventTypeEnum.StatusRemove, eventCondition: ["StatusID:regex:^4098$"],userControl: false)]
+    public void ArmoredScales_SnakesBane_RemoveEnmity(Event @event, ScriptAccessory accessory)
+    {
+        accessory.Method.RemoveDraw($".*蛇鳞击敌方{@event.TargetId()}");
+    }
 
     #endregion
 
@@ -864,6 +907,8 @@ public class PVPAction
             dp.Owner = @event.SourceId();
             dp.Scale = new Vector2(15f);
             dp.DestoryAt = EnmityAOETimer;
+            dp.FadeDistance = 60f;
+            dp.FadeCentreObject = accessory.Data.Me;
             accessory.Method.SendDraw(DrawModeEnum.Default, DrawTypeEnum.Circle, dp);
         }
     }
@@ -893,6 +938,8 @@ public class PVPAction
             dp.Owner = @event.SourceId();
             dp.Scale = new Vector2(30f);
             dp.DestoryAt = EnmityAOETimer;
+            dp.FadeDistance = 60f;
+            dp.FadeCentreObject = accessory.Data.Me;
             accessory.Method.SendDraw(DrawModeEnum.Default, DrawTypeEnum.Circle, dp);
         }
     }
@@ -943,6 +990,21 @@ public class PVPAction
         if (@event.TargetId() != accessory.Data.Me) return; 
         accessory.Method.RemoveDraw($"行列舞预测.*");
     }
+    
+    [ScriptMethod(name: "敌方舞者行列舞范围Omen", eventType: EventTypeEnum.ActionEffect, eventCondition: ["ActionId:regex:^29432$"],suppress:5500)]
+    public void 敌方舞者行列舞范围Omen(Event @event, ScriptAccessory accessory)
+    {
+        var obj = IbcHelper.GetById(accessory, @event.SourceId);
+        if (obj == null || !obj.IsValid()) return;
+        if (obj == accessory.Data.MyObject) return;
+
+        if (!PartyFilter(accessory, obj))
+        {
+            IntPtr ContradanceomenHandle = accessory.Method.VfxMethod.CreateOmen(528, new Vector3(15f), // Omen 590 是边缘吸入Omen
+                @event.TargetPosition(), @event.SourceRotation(), new Vector4(1f,0f,0f,1f), 2000);
+            accessory.Method.VfxMethod.SetVfxSpeed(ContradanceomenHandle,1.5f);
+        }
+    }
 
     #endregion
     

PVP/PVPToy.cs

@@ -179,7 +179,7 @@ public class PVPToy
     
     [ScriptMethod(name: "—————— 四小模式选项 ——————", eventType: EventTypeEnum.StartCasting, eventCondition: ["ActionId:"])]
     public void 四小模式选项(Event @event, ScriptAccessory accessory) { }
-    
+
     [ScriptMethod(name: "小队DK腐秽大地范围描边", eventType: EventTypeEnum.ActionEffect, eventCondition: ["ActionId:regex:^29094$"],suppress:3000)]
     public void 小队DK腐秽大地范围描边(Event @event, ScriptAccessory accessory)
     {
@@ -193,6 +193,8 @@ public class PVPToy
             dp.InnerScale = new Vector2(4.94f);
             dp.Radian = float.Pi * 2;
             dp.DestoryAt = 3000;
+            dp.FadeDistance = 60f;
+            dp.FadeCentreObject = accessory.Data.Me;
             accessory.Method.SendDraw(DrawModeEnum.Default, DrawTypeEnum.Donut, dp);
         }
     }
@@ -208,10 +210,24 @@ public class PVPToy
             dp.Position = @event.EffectPosition;
             dp.Scale = new Vector2(5f); // 吸的范围是10m，但是腐秽大地二段止步的范围是5m
             dp.DestoryAt = 1500;
+            dp.FadeDistance = 60f;
+            dp.FadeCentreObject = accessory.Data.Me;
             accessory.Method.SendDraw(DrawModeEnum.Default, DrawTypeEnum.Circle, dp);
         }
     }
     
+    [ScriptMethod(name: "小队DK腐秽大地范围Omen", eventType: EventTypeEnum.ActionEffect, eventCondition: ["ActionId:regex:^29094$"],suppress:3000)]
+    public void 小队DK腐秽大地范围Omen(Event @event, ScriptAccessory accessory)
+    {
+        if (isPartyMember(accessory, @event.SourceId()))
+        {
+            IntPtr omenHandle = accessory.Method.VfxMethod.CreateOmen(528, new Vector3(10f), // Omen 590 是边缘吸入Omen
+                @event.EffectPosition(), @event.SourceRotation(), new Vector4(0f,1f,0f,1.2f), 1500);
+            // accessory.Method.VfxMethod.SetVfxColorRGBA(omenHandle,new Vector4(0f,1f,0f,1f));
+            accessory.Method.VfxMethod.SetVfxSpeed(omenHandle,1.5f);
+        }
+    }
+    
     [ScriptMethod(name: "小队DK腐秽大地查找连线", eventType: EventTypeEnum.ActionEffect, eventCondition: ["ActionId:regex:^29094$"],suppress:3000)]
     public void 小队DK腐秽大地查找连线(Event @event, ScriptAccessory accessory)
     {
@@ -219,29 +235,34 @@ public class PVPToy
         {
             var dp = accessory.Data.GetDefaultDrawProperties();
             dp.Name = $"小队DK腐秽大地连线{@event.SourceId()}";
-            dp.Color = LightPartyControlAOETetherColor.V4.WithW(4f);
+            dp.Color = LightPartyControlAOETetherColor.V4.WithW(2f);
+            // dp.Color = new Vector4(1f, 0f, 1f, 1f);
             dp.Owner = accessory.Data.Me;
             dp.TargetPosition = @event.EffectPosition();
             dp.ScaleMode |= ScaleMode.YByDistance;
             dp.Scale = new(1);
             dp.DestoryAt = LightPartyMoveActionsTetherTime;
+            dp.FadeDistance = 60f;
+            dp.FadeCentreObject = accessory.Data.Me;
             accessory.Method.SendDraw(DrawModeEnum.Imgui, DrawTypeEnum.Displacement, dp);
         }
     }
     
-    [ScriptMethod(name: "小队舞者行列舞范围描边", eventType: EventTypeEnum.ActionEffect, eventCondition: ["ActionId:regex:^29432$"],suppress:5000)]
+    [ScriptMethod(name: "小队舞者行列舞范围描边", eventType: EventTypeEnum.ActionEffect, eventCondition: ["ActionId:regex:^29432$"],suppress:5500)]
     public void 小队舞者行列舞范围描边(Event @event, ScriptAccessory accessory)
     {
         if (isPartyMember(accessory, @event.SourceId()))
         {
             var dp = accessory.Data.GetDefaultDrawProperties();
             dp.Name = $"小队舞者行列舞范围描边{@event.SourceId}";
-            dp.Color = LightPartyControlAOEColor.V4.WithW(20f);
+            dp.Color = LightPartyControlAOEColor.V4.WithW(30f);
             dp.Owner = @event.SourceId();
             dp.Scale = new Vector2(15f);
-            dp.InnerScale = new Vector2(14.94f);
+            dp.InnerScale = new Vector2(14.92f);
             dp.Radian = float.Pi * 2;
             dp.DestoryAt = 4500;
+            dp.FadeDistance = 60f;
+            dp.FadeCentreObject = accessory.Data.Me;
             accessory.Method.SendDraw(DrawModeEnum.Default, DrawTypeEnum.Donut, dp);
         }
     }
@@ -257,13 +278,26 @@ public class PVPToy
             dp.Owner = @event.SourceId();
             dp.Scale = new Vector2(15f);
             dp.DestoryAt = 2100;
+            dp.FadeDistance = 60f;
+            dp.FadeCentreObject = accessory.Data.Me;
             accessory.Method.SendDraw(DrawModeEnum.Default, DrawTypeEnum.Circle, dp);
         }
     }
     
+    [ScriptMethod(name: "小队舞者行列舞范围Omen", eventType: EventTypeEnum.ActionEffect, eventCondition: ["ActionId:regex:^29432$"],suppress:5500)]
+    public void 小队舞者行列舞范围Omen(Event @event, ScriptAccessory accessory)
+    {
+        if (isPartyMember(accessory, @event.SourceId()))
+        {
+            IntPtr ContradanceomenHandle = accessory.Method.VfxMethod.CreateOmen(590, new Vector3(15f), // Omen 528 是正常吸入Omen
+                @event.TargetPosition(), @event.SourceRotation(), new Vector4(0f,1f,0f,0.8f), 4500);
+            accessory.Method.VfxMethod.SetVfxSpeed(ContradanceomenHandle,1.5f);
+        }
+    }
+    
     /* // 不知道为什么感觉延迟好高 算了 正常应该就2s
 
-    [ScriptMethod(name: "小队舞者诱惑成功提示", eventType: EventTypeEnum.StatusAdd, eventCondition: ["StatusID:regex:^3024$"],suppress:5000)]
+    [ScriptMethod(name: "小队舞者诱惑成功提示", eventType: EventTypeEnum.StatusAdd, eventCondition: ["StatusID:regex:^3024$"],suppress:5500)]
     public void 小队舞者诱惑成功提示(Event @event, ScriptAccessory accessory)
     {
         if (isPartyMember(accessory, @event.SourceId()))
@@ -275,7 +309,7 @@ public class PVPToy
     
     */
     
-    [ScriptMethod(name: "小队舞者行列舞查找连线", eventType: EventTypeEnum.ActionEffect, eventCondition: ["ActionId:regex:^29432$"],suppress:5000)]
+    [ScriptMethod(name: "小队舞者行列舞查找连线", eventType: EventTypeEnum.ActionEffect, eventCondition: ["ActionId:regex:^29432$"],suppress:5500)]
     public void 小队舞者行列舞查找连线(Event @event, ScriptAccessory accessory)
     {
         if (isPartyMember(accessory, @event.SourceId()))
@@ -288,6 +322,8 @@ public class PVPToy
             dp.ScaleMode |= ScaleMode.YByDistance;
             dp.Scale = new(1);
             dp.DestoryAt = LightPartyMoveActionsTetherTime;
+            dp.FadeDistance = 60f;
+            dp.FadeCentreObject = accessory.Data.Me;
             accessory.Method.SendDraw(DrawModeEnum.Imgui, DrawTypeEnum.Displacement, dp);
         }
     }
@@ -386,7 +422,7 @@ public class PVPToy
         }
     }
     
-    [ScriptMethod(name: "对方占星LB播报", eventType: EventTypeEnum.ActionEffect, eventCondition: ["ActionId:29255"],suppress:3000)]
+    [ScriptMethod(name: "对方占星LB播报", eventType: EventTypeEnum.ActionEffect, eventCondition: ["ActionId:29255"],suppress:14000)]
     public void CelestialRiverTTS(Event @event, ScriptAccessory accessory)
     {
         // 星河漫天 ActionId:29255 ； 星河漫天（队友buff） StatusID:3105； 星河漫天（敌方debuff） StatusID:3106 
@@ -510,6 +546,8 @@ public class PVPToy
         dp.TargetObject = @event.TargetId();
         dp.Scale = new(1);
         dp.DestoryAt = 500;
+        dp.FadeDistance = 80f;
+        dp.FadeCentreObject = accessory.Data.Me;
         accessory.Method.SendDraw(DrawModeEnum.Imgui, DrawTypeEnum.Displacement, dp);
     }
     
@@ -532,6 +570,8 @@ public class PVPToy
         dp.TargetObject = @event.TargetId();
         dp.Scale = new(1);
         dp.DestoryAt = 500;
+        dp.FadeDistance = 80f;
+        dp.FadeCentreObject = accessory.Data.Me;
         accessory.Method.SendDraw(DrawModeEnum.Imgui, DrawTypeEnum.Displacement, dp);
     }
     
@@ -554,6 +594,8 @@ public class PVPToy
         dp.TargetObject = @event.TargetId();
         dp.Scale = new(1);
         dp.DestoryAt = 500;
+        dp.FadeDistance = 80f;
+        dp.FadeCentreObject = accessory.Data.Me;
         accessory.Method.SendDraw(DrawModeEnum.Imgui, DrawTypeEnum.Displacement, dp);
     }
     
@@ -576,6 +618,8 @@ public class PVPToy
         dp.TargetObject = @event.TargetId();
         dp.Scale = new(1);
         dp.DestoryAt = 500;
+        dp.FadeDistance = 60f;
+        dp.FadeCentreObject = accessory.Data.Me;
         accessory.Method.SendDraw(DrawModeEnum.Imgui, DrawTypeEnum.Displacement, dp);
     }
     
@@ -689,14 +733,16 @@ public class PVPToy
         if(!isHack) return;
         if (isDRAutoImmunize)
         {
-            accessory.Method.SendChat($"/pdr load AutoImmunizeForceMove");
-            accessory.Method.SendChat($"/pdr load AutoImmunizeInputDisable");
+            accessory.Method.SendChat($"/pdr load AutoImmunizeForceMove"); // 自动免疫强制移动，防止恐慌乱走
+            accessory.Method.SendChat($"/pdr load AutoImmunizeInputDisable"); // 自动免疫输入禁用，防止强控类无法自由移动
+            accessory.Method.SendChat($"/pdr load AutoAntiKnockback"); // 自动防击退，防止诗人爆破箭
         }
 
         if (isICAutohysteria)
         {
-            accessory.Method.SendChat($"/i-ching-commander anti_hysteria enable");
-            accessory.Method.SendChat($"/i-ching-commander forced_move enable");
+            accessory.Method.SendChat($"/i-ching-commander anti_hysteria enable"); // 无视魅惑恐惧
+            accessory.Method.SendChat($"/i-ching-commander forced_move enable"); // 强制移动
+            accessory.Method.SendChat($"/i-ching-commander anti_knock 0 0"); // 防击退
             accessory.Method.SendChat($"/e 已开启IC临时免控");
         }
     }
@@ -711,12 +757,17 @@ public class PVPToy
         {
             accessory.Method.SendChat($"/pdr unload AutoImmunizeForceMove");
             accessory.Method.SendChat($"/pdr unload AutoImmunizeInputDisable");
+            accessory.Method.SendChat($"/pdr unload AutoAntiKnockback");
+            accessory.Method.SendChat($"/pdr unload NoClipMode"); // 无碰撞模式
+
         }
 
         if (isICAutohysteria)
         {
             accessory.Method.SendChat($"/i-ching-commander anti_hysteria dispose");
             accessory.Method.SendChat($"/i-ching-commander forced_move dispose");
+            accessory.Method.SendChat($"/i-ching-commander anti_knock dispose");
+            accessory.Method.SendChat($"/i-ching-commander anti_fallen dispose"); // 无掉落
             accessory.Method.SendChat($"/e 已关闭IC临时免控");
         }
     }