REDCODE/SlaveMatrix-SDL
Public Access
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Tex -> TextBlock

Browse Source
This commit is contained in:
Samuele Lorefice
2026-06-14 00:55:31 +02:00
parent d54695d014
commit 81fcaa5a71
6 changed files with 83 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
2DGAMELIB/_2DGAMELIB/Tex.cs → 2DGAMELIB/_2DGAMELIB/TextBlock.cs
View File

@@ -5,7 +5,7 @@ using System.Linq;
namespace _2DGAMELIB namespace _2DGAMELIB
{ {
public class Tex public class TextBlock
{ {
private PartGroup _partGroup; private PartGroup _partGroup;
@@ -19,7 +19,7 @@ namespace _2DGAMELIB
private double speed = 1.0; private double speed = 1.0;
private Action<Tex> Action = delegate private Action<TextBlock> Action = delegate
{ {
}; };
@@ -33,7 +33,7 @@ namespace _2DGAMELIB
private int Max; private int Max;
public Action<Tex> Done; public Action<TextBlock> Done;
private byte a0; private byte a0;
@@ -127,7 +127,7 @@ namespace _2DGAMELIB
public bool IsPlaying => !f1; public bool IsPlaying => !f1;
public Tex(string Name, Vector2D Position, double Size, double Width, double Height, Font Font, double TextSize, int Space, string Text, Color TextColor, Color ShadColor, Color BackColor, double Speed, Color FeedColor, Action<Tex> Action) public TextBlock(string Name, Vector2D Position, double Size, double Width, double Height, Font Font, double TextSize, int Space, string Text, Color TextColor, Color ShadColor, Color BackColor, double Speed, Color FeedColor, Action<TextBlock> Action)
{ {
try try
{ {
@@ -166,7 +166,7 @@ namespace _2DGAMELIB
mv.BaseSpeed = 2.0; mv.BaseSpeed = 2.0;
} }
public Tex(string Name, Vector2D Position, double Size, double Width, double Height, Font Font, double TextSize, int Space, string Text, Color TextColor, Color ShadColor, Color BackColor, double Speed) public TextBlock(string Name, Vector2D Position, double Size, double Width, double Height, Font Font, double TextSize, int Space, string Text, Color TextColor, Color ShadColor, Color BackColor, double Speed)
{ {
try try
{ {

16
SlaveMatrix/SlaveMatrix/BodyPartClasses/InfoPanel.cs
View File

@@ -13,19 +13,19 @@ namespace SlaveMatrix
public ShapePart MaiB; public ShapePart MaiB;
public Tex Mai; public TextBlock Mai;
public ShapePart Mai2B; public ShapePart Mai2B;
public Tex Mai2; public TextBlock Mai2;
public ShapePart SubB; public ShapePart SubB;
public Tex Sub; public TextBlock Sub;
public ShapePart Sub2B; public ShapePart Sub2B;
public Tex Sub2; public TextBlock Sub2;
private Lab SubInnfo_l; private Lab SubInnfo_l;
@@ -162,7 +162,7 @@ namespace SlaveMatrix
MaiB.BrushColor = Color.FromArgb(160, ColorHelper.Black); MaiB.BrushColor = Color.FromArgb(160, ColorHelper.Black);
MaiB.Hit = false; MaiB.Hit = false;
MaiB.JP.Add(new JointPoint(MaiB.OP.GetCenter())); MaiB.JP.Add(new JointPoint(MaiB.OP.GetCenter()));
Mai = new Tex("Tex1", vector2D, num2, num3 * 0.98, num4 * 0.91, new Font("MS Gothic", 1f), 0.08, 0, " ", ColorHelper.White, ColorHelper.Black, Color.Transparent, 19.0, ColorHelper.White, delegate(Tex sp) Mai = new TextBlock("Tex1", vector2D, num2, num3 * 0.98, num4 * 0.91, new Font("MS Gothic", 1f), 0.08, 0, " ", ColorHelper.White, ColorHelper.Black, Color.Transparent, 19.0, ColorHelper.White, delegate(TextBlock sp)
{ {
sp.Text = sp.Text; sp.Text = sp.Text;
}); });
@@ -181,7 +181,7 @@ namespace SlaveMatrix
Mai2B.BrushColor = Color.FromArgb(160, ColorHelper.Black); Mai2B.BrushColor = Color.FromArgb(160, ColorHelper.Black);
Mai2B.Hit = false; Mai2B.Hit = false;
Mai2B.JP.Add(new JointPoint(Mai2B.OP.GetCenter())); Mai2B.JP.Add(new JointPoint(Mai2B.OP.GetCenter()));
Mai2 = new Tex("Tex3", vector2D, num2, num3 * 0.98, num5 * 0.97, new Font("MS Gothic", 1f), 0.08, 0, " ", ColorHelper.White, ColorHelper.Black, Color.Transparent, 19.0, ColorHelper.White, delegate(Tex sp) Mai2 = new TextBlock("Tex3", vector2D, num2, num3 * 0.98, num5 * 0.97, new Font("MS Gothic", 1f), 0.08, 0, " ", ColorHelper.White, ColorHelper.Black, Color.Transparent, 19.0, ColorHelper.White, delegate(TextBlock sp)
{ {
sp.Text = sp.Text; sp.Text = sp.Text;
}); });
@@ -201,7 +201,7 @@ namespace SlaveMatrix
SubB.BrushColor = Color.FromArgb(160, ColorHelper.Black); SubB.BrushColor = Color.FromArgb(160, ColorHelper.Black);
SubB.Hit = false; SubB.Hit = false;
SubB.JP.Add(new JointPoint(SubB.OP.GetCenter())); SubB.JP.Add(new JointPoint(SubB.OP.GetCenter()));
Sub = new Tex("Tex4", vector2D, num2 * 1.01, num3 * 0.98, num4 * 0.91, new Font("MS Gothic", 1f), 0.07, 0, " ", ColorHelper.White, ColorHelper.Black, Color.Transparent, 15.0); Sub = new TextBlock("Tex4", vector2D, num2 * 1.01, num3 * 0.98, num4 * 0.91, new Font("MS Gothic", 1f), 0.07, 0, " ", ColorHelper.White, ColorHelper.Black, Color.Transparent, 15.0);
Sub.ShapePartT.BasePointBase = Sub.ShapePartT.OP.GetCenter().MulY(y); Sub.ShapePartT.BasePointBase = Sub.ShapePartT.OP.GetCenter().MulY(y);
Sub.Position = SubB.ToGlobal(SubB.JP[0].Joint); Sub.Position = SubB.ToGlobal(SubB.JP[0].Joint);
SubInnfo_l = new Lab(Are, "SubInfo", vector2D, num2, 1.0, new Font("MS Gothic", 1f), 0.07, "Sub Info.", ColorHelper.White, ColorHelper.Black, Color.FromArgb(160, ColorHelper.Black), ColorHelper.Empty); SubInnfo_l = new Lab(Are, "SubInfo", vector2D, num2, 1.0, new Font("MS Gothic", 1f), 0.07, "Sub Info.", ColorHelper.White, ColorHelper.Black, Color.FromArgb(160, ColorHelper.Black), ColorHelper.Empty);
@@ -217,7 +217,7 @@ namespace SlaveMatrix
Sub2B.BrushColor = Color.FromArgb(160, ColorHelper.Black); Sub2B.BrushColor = Color.FromArgb(160, ColorHelper.Black);
Sub2B.Hit = false; Sub2B.Hit = false;
Sub2B.JP.Add(new JointPoint(SubB.OP.GetCenter())); Sub2B.JP.Add(new JointPoint(SubB.OP.GetCenter()));
Sub2 = new Tex("Tex3", Sub2B.PositionBase, num2 * 1.01, num3 * 0.98, num4 * 0.91, new Font("MS Gothic", 1f), 0.07, 0, "", ColorHelper.White, ColorHelper.Black, Color.Transparent, 15.0); Sub2 = new TextBlock("Tex3", Sub2B.PositionBase, num2 * 1.01, num3 * 0.98, num4 * 0.91, new Font("MS Gothic", 1f), 0.07, 0, "", ColorHelper.White, ColorHelper.Black, Color.Transparent, 15.0);
Sub2.ShapePartT.BasePointBase = Sub2.ShapePartT.OP.GetCenter().MulY(y); Sub2.ShapePartT.BasePointBase = Sub2.ShapePartT.OP.GetCenter().MulY(y);
Sub2.Position = Sub2B.ToGlobal(Sub2B.JP[0].Joint); Sub2.Position = Sub2B.ToGlobal(Sub2B.JP[0].Joint);
yp = new ShapePartT(); yp = new ShapePartT();

54
SlaveMatrix/SlaveMatrix/BodyPartClasses/TextBubble.cs
View File

@@ -12,36 +12,36 @@ namespace SlaveMatrix
public 吹出し 吹出し; public 吹出し 吹出し;
public Tex Tex; public TextBlock TextBlock;
public bool Dis; public bool Dis;
public Motion 消失; public Motion 消失;
public Color GetHitColor => Tex.ShapePartT.HitColor; public Color GetHitColor => TextBlock.ShapePartT.HitColor;
public string Text public string Text
{ {
get get
{ {
return Tex.Text; return TextBlock.Text;
} }
set set
{ {
表示 = true; 表示 = true;
if (Dis) if (Dis)
{ {
Tex.Done = delegate TextBlock.Done = delegate
{ {
消失.Max = Tex.Text.Length * 0.125 + 1.0; 消失.Max = TextBlock.Text.Length * 0.125 + 1.0;
消失.Start(); 消失.Start();
}; };
} }
Tex.Text = value; TextBlock.Text = value;
} }
} }
public TextBubble(RenderArea Are, bool 右, Font Font, double TextSize, string Text, Color TextColor, Color ShadColor, Color BackColor, double Speed, bool Dis, Color FeedColor, Action<Tex> Action) public TextBubble(RenderArea Are, bool 右, Font Font, double TextSize, string Text, Color TextColor, Color ShadColor, Color BackColor, double Speed, bool Dis, Color FeedColor, Action<TextBlock> Action)
{ {
吹出し = new 吹出し(Are.DisplayUnitScale); 吹出し = new 吹出し(Are.DisplayUnitScale);
吹出し.SetHitFalse(); 吹出し.SetHitFalse();
@@ -53,9 +53,9 @@ namespace SlaveMatrix
吹出し.位置C = DataConsts.Vec2DUnitY * 0.005; 吹出し.位置C = DataConsts.Vec2DUnitY * 0.005;
吹出し.尺度B = num * 1.1; 吹出し.尺度B = num * 1.1;
吹出し.尺度YB = num2; 吹出し.尺度YB = num2;
Tex = new Tex("Tex", DataConsts.Vec2DZero, 0.1, 吹出し.尺度B, 0.63 * num * num2, Font, TextSize, 25, Text, TextColor, ShadColor, Color.Transparent, Speed, FeedColor, Action); TextBlock = new TextBlock("TextBlock", DataConsts.Vec2DZero, 0.1, 吹出し.尺度B, 0.63 * num * num2, Font, TextSize, 25, Text, TextColor, ShadColor, Color.Transparent, Speed, FeedColor, Action);
Tex.Feed.OP.OutlineFalse(); TextBlock.Feed.OP.OutlineFalse();
Tex.ShapePartT.BasePointBase = Tex.ShapePartT.OP.GetCenter().AddY(0.04); TextBlock.ShapePartT.BasePointBase = TextBlock.ShapePartT.OP.GetCenter().AddY(0.04);
this.Dis = Dis; this.Dis = Dis;
if (Dis) if (Dis)
{ {
@@ -79,8 +79,8 @@ namespace SlaveMatrix
v = (1 + m.Value - m.Max).Inverse(); v = (1 + m.Value - m.Max).Inverse();
吹出し.X0Y0_吹出し.PenColor = Color.FromArgb((int)((double)pa * v), 吹出し.X0Y0_吹出し.PenColor); 吹出し.X0Y0_吹出し.PenColor = Color.FromArgb((int)((double)pa * v), 吹出し.X0Y0_吹出し.PenColor);
吹出し.X0Y0_吹出し.BrushColor = Color.FromArgb((int)((double)ba * v), 吹出し.X0Y0_吹出し.BrushColor); 吹出し.X0Y0_吹出し.BrushColor = Color.FromArgb((int)((double)ba * v), 吹出し.X0Y0_吹出し.BrushColor);
Tex.ShapePartT.TextColor = Color.FromArgb((int)((double)ta * v), Tex.ShapePartT.TextColor); TextBlock.ShapePartT.TextColor = Color.FromArgb((int)((double)ta * v), TextBlock.ShapePartT.TextColor);
Tex.ShapePartT.ShadColor = Color.FromArgb((int)((double)sa * v), Tex.ShapePartT.ShadColor); TextBlock.ShapePartT.ShadColor = Color.FromArgb((int)((double)sa * v), TextBlock.ShapePartT.ShadColor);
}, },
OnReach = delegate(Motion m) OnReach = delegate(Motion m)
{ {
@@ -94,8 +94,8 @@ namespace SlaveMatrix
表示 = false; 表示 = false;
吹出し.X0Y0_吹出し.PenColor = Color.FromArgb(pa, 吹出し.X0Y0_吹出し.PenColor); 吹出し.X0Y0_吹出し.PenColor = Color.FromArgb(pa, 吹出し.X0Y0_吹出し.PenColor);
吹出し.X0Y0_吹出し.BrushColor = Color.FromArgb(ba, 吹出し.X0Y0_吹出し.BrushColor); 吹出し.X0Y0_吹出し.BrushColor = Color.FromArgb(ba, 吹出し.X0Y0_吹出し.BrushColor);
Tex.ShapePartT.TextColor = Color.FromArgb(ta, Tex.ShapePartT.TextColor); TextBlock.ShapePartT.TextColor = Color.FromArgb(ta, TextBlock.ShapePartT.TextColor);
Tex.ShapePartT.ShadColor = Color.FromArgb(sa, Tex.ShapePartT.ShadColor); TextBlock.ShapePartT.ShadColor = Color.FromArgb(sa, TextBlock.ShapePartT.ShadColor);
} }
}; };
} }
@@ -113,8 +113,8 @@ namespace SlaveMatrix
吹出し.位置C = DataConsts.Vec2DUnitY * 0.005; 吹出し.位置C = DataConsts.Vec2DUnitY * 0.005;
吹出し.尺度B = num * 1.1; 吹出し.尺度B = num * 1.1;
吹出し.尺度YB = num2; 吹出し.尺度YB = num2;
Tex = new Tex("Tex", DataConsts.Vec2DZero, 0.1, 吹出し.尺度B, 0.63 * num * num2, Font, TextSize, 25, Text, TextColor, ShadColor, Color.Transparent, Speed); TextBlock = new TextBlock("TextBlock", DataConsts.Vec2DZero, 0.1, 吹出し.尺度B, 0.63 * num * num2, Font, TextSize, 25, Text, TextColor, ShadColor, Color.Transparent, Speed);
Tex.ShapePartT.BasePointBase = Tex.ShapePartT.OP.GetCenter().AddY(0.04); TextBlock.ShapePartT.BasePointBase = TextBlock.ShapePartT.OP.GetCenter().AddY(0.04);
this.Dis = Dis; this.Dis = Dis;
if (Dis) if (Dis)
{ {
@@ -147,8 +147,8 @@ namespace SlaveMatrix
吹出し.X0Y0_吹出し.PenColor = Color.FromArgb(correctPenAlpha, 吹出し.X0Y0_吹出し.PenColor); 吹出し.X0Y0_吹出し.PenColor = Color.FromArgb(correctPenAlpha, 吹出し.X0Y0_吹出し.PenColor);
吹出し.X0Y0_吹出し.BrushColor = Color.FromArgb(correctBrushAlpha, 吹出し.X0Y0_吹出し.BrushColor); 吹出し.X0Y0_吹出し.BrushColor = Color.FromArgb(correctBrushAlpha, 吹出し.X0Y0_吹出し.BrushColor);
Tex.ShapePartT.TextColor = Color.FromArgb(correctTextAlpha, Tex.ShapePartT.TextColor); TextBlock.ShapePartT.TextColor = Color.FromArgb(correctTextAlpha, TextBlock.ShapePartT.TextColor);
Tex.ShapePartT.ShadColor = Color.FromArgb(correctShadeAlpha, Tex.ShapePartT.ShadColor); TextBlock.ShapePartT.ShadColor = Color.FromArgb(correctShadeAlpha, TextBlock.ShapePartT.ShadColor);
}, },
OnReach = delegate(Motion m) OnReach = delegate(Motion m)
{ {
@@ -162,8 +162,8 @@ namespace SlaveMatrix
表示 = false; 表示 = false;
吹出し.X0Y0_吹出し.PenColor = Color.FromArgb(pa, 吹出し.X0Y0_吹出し.PenColor); 吹出し.X0Y0_吹出し.PenColor = Color.FromArgb(pa, 吹出し.X0Y0_吹出し.PenColor);
吹出し.X0Y0_吹出し.BrushColor = Color.FromArgb(ba, 吹出し.X0Y0_吹出し.BrushColor); 吹出し.X0Y0_吹出し.BrushColor = Color.FromArgb(ba, 吹出し.X0Y0_吹出し.BrushColor);
Tex.ShapePartT.TextColor = Color.FromArgb(ta, Tex.ShapePartT.TextColor); TextBlock.ShapePartT.TextColor = Color.FromArgb(ta, TextBlock.ShapePartT.TextColor);
Tex.ShapePartT.ShadColor = Color.FromArgb(sa, Tex.ShapePartT.ShadColor); TextBlock.ShapePartT.ShadColor = Color.FromArgb(sa, TextBlock.ShapePartT.ShadColor);
} }
}; };
} }
@@ -171,7 +171,7 @@ namespace SlaveMatrix
public void SetHitColor(ModeEventDispatcher Med) public void SetHitColor(ModeEventDispatcher Med)
{ {
Tex.SetHitColor(Med); TextBlock.SetHitColor(Med);
} }
public void 接続(JointS 接続元) public void 接続(JointS 接続元)
@@ -182,23 +182,23 @@ namespace SlaveMatrix
public void Down(Color HitColor) public void Down(Color HitColor)
{ {
Tex.Down(ref HitColor); TextBlock.Down(ref HitColor);
} }
public void Up(Color HitColor) public void Up(Color HitColor)
{ {
Tex.Up(ref HitColor); TextBlock.Up(ref HitColor);
} }
public void 接続() public void 接続()
{ {
吹出し.接続P(); 吹出し.接続P();
Tex.Position = 吹出し.X0Y0_吹出し.ToGlobal(吹出し.X0Y0_吹出し.JP[0].Joint); TextBlock.Position = 吹出し.X0Y0_吹出し.ToGlobal(吹出し.X0Y0_吹出し.JP[0].Joint);
} }
public void Draw(RenderArea Are, FPS FPS) public void Draw(RenderArea Are, FPS FPS)
{ {
Tex.Progression(FPS); TextBlock.Progression(FPS);
if (Dis) if (Dis)
{ {
消失.GetValue(FPS); 消失.GetValue(FPS);
@@ -206,14 +206,14 @@ namespace SlaveMatrix
if (表示) if (表示)
{ {
吹出し.Body.Draw(Are); 吹出し.Body.Draw(Are);
Are.Draw(Tex.PartGroup); Are.Draw(TextBlock.PartGroup);
} }
} }
public void Dispose() public void Dispose()
{ {
吹出し.Dispose(); 吹出し.Dispose();
Tex.Dispose(); TextBlock.Dispose();
} }
} }
} }

68
SlaveMatrix/SlaveMatrix/GameClasses/ModuleRegistry.cs
View File

@@ -1700,10 +1700,10 @@ namespace SlaveMatrix
SlaveText.Set状態(); SlaveText.Set状態();
if (TrainingTarget.Body.Is顔面) if (TrainingTarget.Body.Is顔面)
{ {
Action<Tex> o_done = SlaveTextBubble.Tex.Done; Action<TextBlock> o_done = SlaveTextBubble.TextBlock.Done;
SlaveTextBubble.Tex.Done = delegate (Tex tex) SlaveTextBubble.TextBlock.Done = delegate (TextBlock TextBlock)
{ {
o_done(tex); o_done(TextBlock);
TrainingTarget.顔面展開.Start(); TrainingTarget.顔面展開.Start();
}; };
} }
@@ -3818,7 +3818,7 @@ namespace SlaveMatrix
ip.Mai2Show = false; ip.Mai2Show = false;
ip.SubShow = true; ip.SubShow = true;
ip.Sub2Show = true; ip.Sub2Show = true;
ViolaTextBubble.Tex.Feed.Dra = false; ViolaTextBubble.TextBlock.Feed.Dra = false;
bs["ボタン1"].Dra = !Sta.GameData.初事務所フラグ; bs["ボタン1"].Dra = !Sta.GameData.初事務所フラグ;
bs["ボタン3"].Dra = Sta.GameData.RepaymentStage == 3; bs["ボタン3"].Dra = Sta.GameData.RepaymentStage == 3;
Viola.両目_見つめ(); Viola.両目_見つめ();
@@ -6076,13 +6076,13 @@ namespace SlaveMatrix
GameText.話が進む, GameText.話が進む,
GameText.事は運ぶ GameText.事は運ぶ
}; };
Action<Tex> d = delegate Action<TextBlock> d = delegate
{ {
ip.SubInfo = GameText.安い額ではない; ip.SubInfo = GameText.安い額ではない;
ip.選択yAct = delegate ip.選択yAct = delegate
{ {
//Sounds.操作.Play(); //Sounds.操作.Play();
ViolaTextBubble.Tex.Done = delegate ViolaTextBubble.TextBlock.Done = delegate
{ {
//Sounds.精算.Play(); //Sounds.精算.Play();
Sta.GameData.借金 = 5000000000uL; Sta.GameData.借金 = 5000000000uL;
@@ -6106,7 +6106,7 @@ namespace SlaveMatrix
ip.選択nAct = delegate ip.選択nAct = delegate
{ {
//Sounds.操作.Play(); //Sounds.操作.Play();
ViolaTextBubble.Tex.Done = delegate ViolaTextBubble.TextBlock.Done = delegate
{ {
//Sounds.精算.Play(); //Sounds.精算.Play();
Sta.GameData.借金 = 5000000000uL; Sta.GameData.借金 = 5000000000uL;
@@ -6132,9 +6132,9 @@ namespace SlaveMatrix
mod.Down = delegate(MouseButtons mb, Vector2D cp, Color hc) mod.Down = delegate(MouseButtons mb, Vector2D cp, Color hc)
{ {
ip.DownB(ref hc); ip.DownB(ref hc);
if (!ViolaTextBubble.Tex.IsPlaying && !ip.Mai.IsPlaying && !ip.Sub.IsPlaying) if (!ViolaTextBubble.TextBlock.IsPlaying && !ip.Mai.IsPlaying && !ip.Sub.IsPlaying)
{ {
if (wi == i && i != 10 && ViolaTextBubble.Tex.Done == null) if (wi == i && i != 10 && ViolaTextBubble.TextBlock.Done == null)
{ {
i++; i++;
wi = i; wi = i;
@@ -6142,11 +6142,11 @@ namespace SlaveMatrix
{ {
if (i == 10) if (i == 10)
{ {
ViolaTextBubble.Tex.Done = d; ViolaTextBubble.TextBlock.Done = d;
} }
else else
{ {
ViolaTextBubble.Tex.Done = null; ViolaTextBubble.TextBlock.Done = null;
} }
if (i != 11) if (i != 11)
{ {
@@ -6315,7 +6315,7 @@ namespace SlaveMatrix
mod.Down = delegate(MouseButtons mb, Vector2D cp, Color hc) mod.Down = delegate(MouseButtons mb, Vector2D cp, Color hc)
{ {
ip.DownB(ref hc); ip.DownB(ref hc);
if (!ViolaTextBubble.Tex.IsPlaying && !ip.Mai.IsPlaying && !ip.Sub.IsPlaying && wi == i) if (!ViolaTextBubble.TextBlock.IsPlaying && !ip.Mai.IsPlaying && !ip.Sub.IsPlaying && wi == i)
{ {
i++; i++;
wi = i; wi = i;
@@ -6467,7 +6467,7 @@ namespace SlaveMatrix
GameText.話が終わる, GameText.話が終わる,
GameText.話は終わる GameText.話は終わる
}; };
Action<Tex> d1 = delegate Action<TextBlock> d1 = delegate
{ {
ip.Mai.Done = delegate ip.Mai.Done = delegate
{ {
@@ -6511,7 +6511,7 @@ namespace SlaveMatrix
}; };
ip.Text = GameText.金が無い; ip.Text = GameText.金が無い;
}; };
Action<Tex> d2 = delegate Action<TextBlock> d2 = delegate
{ {
ip.Mai.Done = delegate ip.Mai.Done = delegate
{ {
@@ -6531,10 +6531,10 @@ namespace SlaveMatrix
ip.Text = GameText.エクス2; ip.Text = GameText.エクス2;
ip.SubInfo = GameText.あなたの鎖は弾け飛ぶ; ip.SubInfo = GameText.あなたの鎖は弾け飛ぶ;
ViolaTextBubble.Text = GameText.あらあら今ので利子が上がってしまったわうふふ; ViolaTextBubble.Text = GameText.あらあら今ので利子が上がってしまったわうふふ;
ViolaTextBubble.Tex.Feed.Dra = true; ViolaTextBubble.TextBlock.Feed.Dra = true;
Sta.GameData.利子 *= 2.0; Sta.GameData.利子 *= 2.0;
}; };
ViolaTextBubble.Tex.Feed.Dra = false; ViolaTextBubble.TextBlock.Feed.Dra = false;
Viola.Body.拘束具_表示 = true; Viola.Body.拘束具_表示 = true;
Viola.両翼獣_閉じ(0); Viola.両翼獣_閉じ(0);
Viola.両触手_S字(0); Viola.両触手_S字(0);
@@ -6582,9 +6582,9 @@ namespace SlaveMatrix
mod.Down = delegate(MouseButtons mb, Vector2D cp, Color hc) mod.Down = delegate(MouseButtons mb, Vector2D cp, Color hc)
{ {
ip.DownB(ref hc); ip.DownB(ref hc);
if (!ViolaTextBubble.Tex.IsPlaying && !ip.Mai.IsPlaying && !ip.Sub.IsPlaying) if (!ViolaTextBubble.TextBlock.IsPlaying && !ip.Mai.IsPlaying && !ip.Sub.IsPlaying)
{ {
if (wi == i && i != 1 && i != 6 && ViolaTextBubble.Tex.Done == null) if (wi == i && i != 1 && i != 6 && ViolaTextBubble.TextBlock.Done == null)
{ {
i++; i++;
wi = i; wi = i;
@@ -6597,15 +6597,15 @@ namespace SlaveMatrix
} }
if (i == 1) if (i == 1)
{ {
ViolaTextBubble.Tex.Done = d1; ViolaTextBubble.TextBlock.Done = d1;
} }
else if (i == 6) else if (i == 6)
{ {
ViolaTextBubble.Tex.Done = d2; ViolaTextBubble.TextBlock.Done = d2;
} }
else else
{ {
ViolaTextBubble.Tex.Done = null; ViolaTextBubble.TextBlock.Done = null;
} }
if (i != 2 && i != 7) if (i != 2 && i != 7)
{ {
@@ -6648,7 +6648,7 @@ namespace SlaveMatrix
ip.Mai2Show = false; ip.Mai2Show = false;
ip.SubShow = true; ip.SubShow = true;
ip.Sub2Show = true; ip.Sub2Show = true;
ViolaTextBubble.Tex.Feed.Dra = true; ViolaTextBubble.TextBlock.Feed.Dra = true;
Viola.両目_見つめ(); Viola.両目_見つめ();
Viola.表情_基本0(); Viola.表情_基本0();
Viola.Set基本姿勢(); Viola.Set基本姿勢();
@@ -6723,7 +6723,7 @@ namespace SlaveMatrix
mod.Down = delegate(MouseButtons mb, Vector2D cp, Color hc) mod.Down = delegate(MouseButtons mb, Vector2D cp, Color hc)
{ {
ip.DownB(ref hc); ip.DownB(ref hc);
if (!ViolaTextBubble.Tex.IsPlaying && !ip.Mai.IsPlaying && !ip.Sub.IsPlaying && wi == i) if (!ViolaTextBubble.TextBlock.IsPlaying && !ip.Mai.IsPlaying && !ip.Sub.IsPlaying && wi == i)
{ {
i++; i++;
wi = i; wi = i;
@@ -6756,7 +6756,7 @@ namespace SlaveMatrix
ip.Mai2Show = false; ip.Mai2Show = false;
ip.SubShow = true; ip.SubShow = true;
ip.Sub2Show = true; ip.Sub2Show = true;
ViolaTextBubble.Tex.Feed.Dra = true; ViolaTextBubble.TextBlock.Feed.Dra = true;
Viola.両目_見つめ(); Viola.両目_見つめ();
Viola.表情_基本0(); Viola.表情_基本0();
Viola.Set基本姿勢(); Viola.Set基本姿勢();
@@ -6831,7 +6831,7 @@ namespace SlaveMatrix
mod.Down = delegate(MouseButtons mb, Vector2D cp, Color hc) mod.Down = delegate(MouseButtons mb, Vector2D cp, Color hc)
{ {
ip.DownB(ref hc); ip.DownB(ref hc);
if (!ViolaTextBubble.Tex.IsPlaying && !ip.Mai.IsPlaying && !ip.Sub.IsPlaying && wi == i) if (!ViolaTextBubble.TextBlock.IsPlaying && !ip.Mai.IsPlaying && !ip.Sub.IsPlaying && wi == i)
{ {
i++; i++;
wi = i; wi = i;
@@ -6870,7 +6870,7 @@ namespace SlaveMatrix
ip.Mai2Show = false; ip.Mai2Show = false;
ip.SubShow = true; ip.SubShow = true;
ip.Sub2Show = true; ip.Sub2Show = true;
ViolaTextBubble.Tex.Feed.Dra = true; ViolaTextBubble.TextBlock.Feed.Dra = true;
Viola.両目_見つめ(); Viola.両目_見つめ();
Viola.表情_基本0(); Viola.表情_基本0();
Viola.Set基本姿勢(); Viola.Set基本姿勢();
@@ -7019,7 +7019,7 @@ namespace SlaveMatrix
GameText.余韻に浸る, GameText.余韻に浸る,
GameText.物語は終わった GameText.物語は終わった
}; };
Action<Tex> d1 = delegate Action<TextBlock> d1 = delegate
{ {
ip.Mai.Done = delegate ip.Mai.Done = delegate
{ {
@@ -7068,9 +7068,9 @@ namespace SlaveMatrix
mod.Down = delegate(MouseButtons mb, Vector2D cp, Color hc) mod.Down = delegate(MouseButtons mb, Vector2D cp, Color hc)
{ {
ip.DownB(ref hc); ip.DownB(ref hc);
if (!ViolaTextBubble.Tex.IsPlaying && !ip.Mai.IsPlaying && !ip.Sub.IsPlaying) if (!ViolaTextBubble.TextBlock.IsPlaying && !ip.Mai.IsPlaying && !ip.Sub.IsPlaying)
{ {
if (wi == i && i != 2 && ViolaTextBubble.Tex.Done == null) if (wi == i && i != 2 && ViolaTextBubble.TextBlock.Done == null)
{ {
i++; i++;
wi = i; wi = i;
@@ -7078,11 +7078,11 @@ namespace SlaveMatrix
{ {
if (i == 2) if (i == 2)
{ {
ViolaTextBubble.Tex.Done = d1; ViolaTextBubble.TextBlock.Done = d1;
} }
else else
{ {
ViolaTextBubble.Tex.Done = null; ViolaTextBubble.TextBlock.Done = null;
} }
if (i != 3) if (i != 3)
{ {
@@ -7161,7 +7161,7 @@ namespace SlaveMatrix
ip.Mai2Show = false; ip.Mai2Show = false;
ip.SubShow = true; ip.SubShow = true;
ip.Sub2Show = true; ip.Sub2Show = true;
ViolaTextBubble.Tex.Feed.Dra = true; ViolaTextBubble.TextBlock.Feed.Dra = true;
Viola.両目_見つめ(); Viola.両目_見つめ();
Viola.表情_基本0(); Viola.表情_基本0();
Viola.Set基本姿勢(); Viola.Set基本姿勢();
@@ -7231,7 +7231,7 @@ namespace SlaveMatrix
mod.Down = delegate(MouseButtons mb, Vector2D cp, Color hc) mod.Down = delegate(MouseButtons mb, Vector2D cp, Color hc)
{ {
ip.DownB(ref hc); ip.DownB(ref hc);
if (!ViolaTextBubble.Tex.IsPlaying && !ip.Mai.IsPlaying && !ip.Sub.IsPlaying && wi == i) if (!ViolaTextBubble.TextBlock.IsPlaying && !ip.Mai.IsPlaying && !ip.Sub.IsPlaying && wi == i)
{ {
i++; i++;
wi = i; wi = i;
@@ -7270,7 +7270,7 @@ namespace SlaveMatrix
ip.Mai2Show = false; ip.Mai2Show = false;
ip.SubShow = true; ip.SubShow = true;
ip.Sub2Show = true; ip.Sub2Show = true;
ViolaTextBubble.Tex.Feed.Dra = true; ViolaTextBubble.TextBlock.Feed.Dra = true;
Viola.両目_見つめ(); Viola.両目_見つめ();
Viola.表情_基本0(); Viola.表情_基本0();
Viola.Set基本姿勢(); Viola.Set基本姿勢();

2
SlaveMatrix/SlaveMatrix/GameClasses/Player.cs
View File

@@ -2638,7 +2638,7 @@ namespace SlaveMatrix
UI.SensitivityBox.TextIm = "Sensitivities:\r\n"; UI.SensitivityBox.TextIm = "Sensitivities:\r\n";
foreach (KeyValuePair<ContactType, double> item in chaD.Sesnsitivities) foreach (KeyValuePair<ContactType, double> item in chaD.Sesnsitivities)
{ {
Tex sensitivityBox = UI.SensitivityBox; TextBlock sensitivityBox = UI.SensitivityBox;
sensitivityBox.TextIm = sensitivityBox.TextIm + GameText.TouchTranslation(item.Key) + ": " + item.Value.Numf1() + "\r\n"; sensitivityBox.TextIm = sensitivityBox.TextIm + GameText.TouchTranslation(item.Key) + ": " + item.Value.Numf1() + "\r\n";
} }
} }

16
SlaveMatrix/SlaveMatrix/GameClasses/TrainingUI.cs
View File

@@ -113,9 +113,9 @@ namespace SlaveMatrix
public Gau 射精mゲージ; public Gau 射精mゲージ;
public Gau 興奮mゲージ; public Gau 興奮mゲージ;
public Tex ステート; public TextBlock ステート;
public Tex InfoBox; public TextBlock InfoBox;
public Tex SensitivityBox; public TextBlock SensitivityBox;
@@ -3032,8 +3032,8 @@ namespace SlaveMatrix
Film.Dispose(); Film.Dispose();
InfoBox.Dispose(); InfoBox.Dispose();
SensitivityBox.Dispose(); SensitivityBox.Dispose();
//((Tex)(object)SlaveStamina).Dispose(); //((TextBlock)(object)SlaveStamina).Dispose();
//((Tex)(object)PlayerStamina).Dispose(); //((TextBlock)(object)PlayerStamina).Dispose();
} }
public void Action(ContactType 接触, ActionType アクション情報, CurrentState タイミング情報, ToolType アイテム情報, int 挿入Lv, int 強さ, bool 機械, bool 射精) public void Action(ContactType 接触, ActionType アクション情報, CurrentState タイミング情報, ToolType アイテム情報, int 挿入Lv, int 強さ, bool 機械, bool 射精)
@@ -3053,9 +3053,9 @@ namespace SlaveMatrix
{ {
width = 0.75; width = 0.75;
} }
ステート = new Tex("Tex", new Vector2D(Are.GetPosition(0.08, 0.7).X, 0.1), 0.1, width, 1.15, new Font("MS Gothic", 1f), 0.07, 0, "", ColorHelper.White, ColorHelper.Black, Color.FromArgb(160, ColorHelper.Black), 15.0); ステート = new TextBlock("TextBlock", new Vector2D(Are.GetPosition(0.08, 0.7).X, 0.1), 0.1, width, 1.15, new Font("MS Gothic", 1f), 0.07, 0, "", ColorHelper.White, ColorHelper.Black, Color.FromArgb(160, ColorHelper.Black), 15.0);
InfoBox = new Tex("Info", new Vector2D(num, 0.005), 0.1, 0.9, 0.85, new Font("MS Gothic", 1f), 0.07, 0, "", ColorHelper.White, ColorHelper.Transparent, Color.FromArgb(15, ColorHelper.DarkMagenta), 100.0); InfoBox = new TextBlock("Info", new Vector2D(num, 0.005), 0.1, 0.9, 0.85, new Font("MS Gothic", 1f), 0.07, 0, "", ColorHelper.White, ColorHelper.Transparent, Color.FromArgb(15, ColorHelper.DarkMagenta), 100.0);
SensitivityBox = new Tex("Sens", new Vector2D(num + 0.02, 0.08), 0.1, 0.6, 1.99, new Font("MS Gothic", 1f), 0.057, 0, "", ColorHelper.White, ColorHelper.Transparent, Color.FromArgb(5, ColorHelper.DarkMagenta), 100.0); SensitivityBox = new TextBlock("Sens", new Vector2D(num + 0.02, 0.08), 0.1, 0.6, 1.99, new Font("MS Gothic", 1f), 0.057, 0, "", ColorHelper.White, ColorHelper.Transparent, Color.FromArgb(5, ColorHelper.DarkMagenta), 100.0);
} }
public void StaminaButtons(RenderArea Are, ModeEventDispatcher Med, InfoPanel ip) public void StaminaButtons(RenderArea Are, ModeEventDispatcher Med, InfoPanel ip)