From fdf4df52fbe4176ec2a3ecdfeb0160b449fe797a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=8D=97=E6=B2=A2=E5=93=8D=E4=B9=9F?= <72963826+Hibiya615@users.noreply.github.com> Date: Tue, 4 Mar 2025 18:47:19 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E7=BB=98=E5=88=B6=E9=A2=9C?= =?UTF-8?q?=E8=89=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Fate/Daivadipa.cs | 8 +++---- Fate/Formidable.cs | 52 +++++++++++++++++++++++++++++++++------------- Fate/Ttokrrone.cs | 14 ++++++------- 3 files changed, 48 insertions(+), 26 deletions(-) diff --git a/Fate/Daivadipa.cs b/Fate/Daivadipa.cs index a68abab..eefa33f 100644 --- a/Fate/Daivadipa.cs +++ b/Fate/Daivadipa.cs @@ -119,11 +119,11 @@ public class Daivadipa dp.Color = accessory.Data.DefaultDangerColor; dp.Scale = new(10f, 50f); - dp.DestoryAt = 7700; + dp.DestoryAt = 6200; dp1.Color = accessory.Data.DefaultDangerColor; dp1.Scale = new(10f, 50f); - dp1.DestoryAt = 2000; + dp1.DestoryAt = 2200; switch (@event.ActionId()) { @@ -139,7 +139,7 @@ public class Daivadipa { dp1.Name = "圣火猛击蓝"; dp1.Owner = item.EntityId; - dp1.Delay = 7700; + dp1.Delay = 6200; accessory.Method.SendDraw(DrawModeEnum.Default, DrawTypeEnum.Rect, dp1); } break; @@ -156,7 +156,7 @@ public class Daivadipa { dp1.Name = "圣火猛击红"; dp1.Owner = item.EntityId; - dp1.Delay = 7700; + dp1.Delay = 6200; accessory.Method.SendDraw(DrawModeEnum.Default, DrawTypeEnum.Rect, dp1); } break; diff --git a/Fate/Formidable.cs b/Fate/Formidable.cs index d6e3b63..f4e5482 100644 --- a/Fate/Formidable.cs +++ b/Fate/Formidable.cs @@ -91,6 +91,16 @@ public class Formidable dp.Radian = float.Pi * 2; dp.DestoryAt = 22800; accessory.Method.SendDraw(DrawModeEnum.Default, DrawTypeEnum.Donut, dp); + + var dp1 = accessory.Data.GetDefaultDrawProperties(); + dp1.Name = "格鲁格之火InhaleRim"; + dp1.Color = new Vector4(1f, 0f, 1f, 2f); + dp1.Owner = @event.SourceId(); + dp1.Scale = new Vector2(10.05f); + dp1.InnerScale = new Vector2(10f); + dp1.Radian = float.Pi * 2; + dp1.DestoryAt = 22800; + accessory.Method.SendDraw(DrawModeEnum.Default, DrawTypeEnum.Donut, dp1); } /* @@ -121,7 +131,7 @@ public class Formidable accessory.Method.SendDraw(DrawModeEnum.Default, DrawTypeEnum.Circle, dp); } - /* + [ScriptMethod(name: "矮人式导弹 高亮", eventType: EventTypeEnum.AddCombatant, eventCondition: ["DataId:11221"])] public void 矮人式导弹(Event @event, ScriptAccessory accessory) { @@ -133,14 +143,14 @@ public class Formidable dp.DestoryAt = 30000; accessory.Method.SendDraw(DrawModeEnum.Default, DrawTypeEnum.Straight, dp); } - */ + [ScriptMethod(name: "矮人式导弹 爆炸范围预测", eventType: EventTypeEnum.AddCombatant, eventCondition: ["DataId:11221"])] - public void 矮人式导弹(Event @event, ScriptAccessory accessory) + public void 矮人式导弹_爆炸(Event @event, ScriptAccessory accessory) { var dp = accessory.Data.GetDefaultDrawProperties(); - dp.Name = $"矮人式导弹{@event.SourceId()}"; - dp.Color = new Vector4(1f, 0f, 0f, 1f); + dp.Name = $"矮人式导弹爆炸{@event.SourceId()}"; + dp.Color = new Vector4(1f, 0.4f, 0f, 0.6f); dp.Owner = @event.SourceId(); dp.Scale = new Vector2(6f); dp.DestoryAt = 30000; @@ -151,12 +161,14 @@ public class Formidable public void 矮人式导弹爆炸销毁(Event @event, ScriptAccessory accessory) { accessory.Method.RemoveDraw($"矮人式导弹{@event.SourceId()}"); + accessory.Method.RemoveDraw($"矮人式导弹爆炸{@event.SourceId()}"); } [ScriptMethod(name: "矮人式导弹 移除销毁", eventType: EventTypeEnum.RemoveCombatant, eventCondition: ["DataId:11221"], userControl: false)] public void 矮人式导弹移除销毁(Event @event, ScriptAccessory accessory) { accessory.Method.RemoveDraw($"矮人式导弹{@event.SourceId()}"); + accessory.Method.RemoveDraw($"矮人式导弹爆炸{@event.SourceId()}"); } [ScriptMethod(name: "矮人雷击弹（钢铁）", eventType: EventTypeEnum.AddCombatant, eventCondition: ["DataId:11228"])] @@ -179,7 +191,7 @@ public class Formidable var dp = accessory.Data.GetDefaultDrawProperties(); dp.Name = "矮人雷击弹月环"; - dp.Color = new Vector4(1f, 0f, 1f, 0.4f); + dp.Color = new Vector4(1f, 0f, 1f, 0.5f); dp.Owner = @event.SourceId(); dp.Scale = new Vector2(60f); dp.InnerScale = new Vector2(8.5f); @@ -188,14 +200,24 @@ public class Formidable accessory.Method.SendDraw(DrawModeEnum.Default, DrawTypeEnum.Donut, dp); var dp1 = accessory.Data.GetDefaultDrawProperties(); - dp1.Name = "月环连线"; - dp1.Owner = accessory.Data.Me; - dp1.Color = accessory.Data.DefaultSafeColor; - dp1.ScaleMode |= ScaleMode.YByDistance; - dp1.TargetObject = @event.SourceId(); - dp1.Scale = new(1); + dp1.Name = "矮人雷击弹月环描边"; + dp1.Color = new Vector4(1f, 0f, 1f, 2f); + dp1.Owner = @event.SourceId(); + dp1.Scale = new Vector2(8.55f); + dp1.InnerScale = new Vector2(8.5f); + dp1.Radian = float.Pi * 2; dp1.DestoryAt = 6200; - accessory.Method.SendDraw(DrawModeEnum.Imgui, DrawTypeEnum.Displacement, dp1); + accessory.Method.SendDraw(DrawModeEnum.Default, DrawTypeEnum.Donut, dp); + + var dp2 = accessory.Data.GetDefaultDrawProperties(); + dp2.Name = "月环连线"; + dp2.Owner = accessory.Data.Me; + dp2.Color = accessory.Data.DefaultSafeColor; + dp2.ScaleMode |= ScaleMode.YByDistance; + dp2.TargetObject = @event.SourceId(); + dp2.Scale = new(1); + dp2.DestoryAt = 6200; + accessory.Method.SendDraw(DrawModeEnum.Imgui, DrawTypeEnum.Displacement, dp2); } @@ -220,9 +242,9 @@ public class Formidable public async void 运动体探知干扰器(Event @event, ScriptAccessory accessory) { if ( @event.TargetId() != accessory.Data.Me) return; - await Task.Delay(7500); + await Task.Delay(3500); - accessory.Method.TextInfo("停止行动", duration: 2000, true); + accessory.Method.TextInfo("停止行动", duration: 1500, true); accessory.Method.TTS("停止行动"); } diff --git a/Fate/Ttokrrone.cs b/Fate/Ttokrrone.cs index 33c8fea..eb88e43 100644 --- a/Fate/Ttokrrone.cs +++ b/Fate/Ttokrrone.cs @@ -245,14 +245,14 @@ public class Ttokrrone { case 37331: // 钢铁 dp.Name = "飞沙钢铁"; - dp.Color = new Vector4(1f, 0f, 0f, 1f); + dp.Color = new Vector4(1f, 0f, 0f, 1.5f); dp.Scale = new Vector2(19f); accessory.Method.SendDraw(DrawModeEnum.Default, DrawTypeEnum.Circle, dp); break; case 37332: // 月环 dp.Name = "飞沙月环"; - dp.Color = new Vector4(0f, 0.6f, 1f, 1f); + dp.Color = new Vector4(0f, 0f, 1f, 1.2f); dp.Scale = new Vector2(60f); dp.InnerScale = new Vector2(14f); dp.Radian = float.Pi * 2; @@ -261,7 +261,7 @@ public class Ttokrrone case 37333: // 左半钢铁 + 右半月环 dp.Name = "飞沙左半钢铁"; - dp.Color = new Vector4(1f, 0f, 0f, 1f); + dp.Color = new Vector4(1f, 0f, 0f, 1.5f); dp.Scale = new Vector2(19); dp.Radian = 180f.DegToRad(); dp.Rotation = 90f.DegToRad(); @@ -269,7 +269,7 @@ public class Ttokrrone var dp1 = accessory.Data.GetDefaultDrawProperties(); dp1.Name = "飞沙右半月环"; - dp1.Color = new Vector4(0f, 0.6f, 1f, 1f); + dp.Color = new Vector4(0f, 0f, 1f, 1.4f); dp1.Owner = @event.SourceId(); dp1.Scale = new Vector2(60); dp1.InnerScale = new Vector2(14); @@ -281,7 +281,7 @@ public class Ttokrrone case 37334: // 右半钢铁 + 左半月环 dp.Name = "飞沙右半钢铁"; - dp.Color = new Vector4(1f, 0f, 0f, 1f); + dp.Color = new Vector4(1f, 0f, 0f, 1.5f); dp.Scale = new Vector2(19); dp.Radian = 180f.DegToRad(); dp.Rotation = 270f.DegToRad(); @@ -289,7 +289,7 @@ public class Ttokrrone var dp2 = accessory.Data.GetDefaultDrawProperties(); dp2.Name = "飞沙左半月环"; - dp2.Color = new Vector4(0f, 0.6f, 1f, 1f); + dp2.Color = new Vector4(0f, 0f, 1f, 1.4f); dp2.Owner = @event.SourceId(); dp2.Scale = new Vector2(60); dp2.InnerScale = new Vector2(14); @@ -333,7 +333,7 @@ public class Ttokrrone dp.Name = "吞地巨蛇"; dp.Scale = new (27, 68f); dp.Owner = @event.SourceId(); - dp.Color = new Vector4(1f, 0f, 0f, 0.8f); + dp.Color = new Vector4(1f, 0.2f, 0f, 0.6f); dp.DestoryAt = @event.DurationMilliseconds() + 1400; accessory.Method.SendDraw(DrawModeEnum.Default, DrawTypeEnum.Rect, dp); }