CM -> character element

This commit is contained in:
2026-06-14 00:30:16 +02:00
parent 52e7023bd7
commit 0261ced533
12 changed files with 89 additions and 89 deletions

View File

@@ -12,13 +12,13 @@ namespace SlaveMatrix
public ConstProp CP右 = new ConstProp(); public ConstProp CP右 = new ConstProp();
public CM 1; public CharacterElement 1;
public CM 2; public CharacterElement 2;
public CM 3; public CharacterElement 3;
private Dictionary<Element, CM> = new Dictionary<Element, CM>(); private Dictionary<Element, CharacterElement> = new Dictionary<Element, CharacterElement>();
private ; private ;
@@ -589,9 +589,9 @@ namespace SlaveMatrix
.SetDefault(); .SetDefault();
1D e = new 1D(); 1D e = new 1D();
e.SetValuesD("表示", true); e.SetValuesD("表示", true);
1 = new CM(Med, 調UI, 調UI.1 = new 1(disUnit, .N0, null, Med, e)); 1 = new CharacterElement(Med, 調UI, 調UI.1 = new 1(disUnit, .N0, null, Med, e));
2 = new CM(Med, 調UI, 調UI.2 = new 1(disUnit, .N0, null, Med, e)); 2 = new CharacterElement(Med, 調UI, 調UI.2 = new 1(disUnit, .N0, null, Med, e));
3 = new CM(Med, 調UI, 調UI.3 = new 1(disUnit, .N0, null, Med, e)); 3 = new CharacterElement(Med, 調UI, 調UI.3 = new 1(disUnit, .N0, null, Med, e));
= default(); = default();
.SetDefault(); .SetDefault();
調UI.1.(); 調UI.1.();
@@ -600,9 +600,9 @@ namespace SlaveMatrix
調UI.1.Intensity = 0.5; 調UI.1.Intensity = 0.5;
調UI.2.Intensity = 0.5; 調UI.2.Intensity = 0.5;
調UI.3.Intensity = 0.5; 調UI.3.Intensity = 0.5;
調UI.1CM = 1; 調UI.1CharacterElement = 1;
調UI.2CM = 2; 調UI.2CharacterElement = 2;
調UI.3CM = 3; 調UI.3CharacterElement = 3;
double d = 0.0005; double d = 0.0005;
Vector2D p = DataConsts.Vec2DZero; Vector2D p = DataConsts.Vec2DZero;
= new Motion(-1.0, 1.0) = new Motion(-1.0, 1.0)

View File

@@ -866,7 +866,7 @@ namespace SlaveMatrix
} }
} }
public (TrainingUI 調UI, CM ) public (TrainingUI 調UI, CharacterElement )
: base(調UI, ) : base(調UI, )
{ {
2 = this; 2 = this;

View File

@@ -543,7 +543,7 @@ namespace SlaveMatrix
.Start(); .Start();
} }
public (TrainingUI 調UI, CM ) public (TrainingUI 調UI, CharacterElement )
: base(調UI, ) : base(調UI, )
{ {
2 = this; 2 = this;

View File

@@ -328,7 +328,7 @@ namespace SlaveMatrix
} }
} }
public (TrainingUI 調UI, CM ) public (TrainingUI 調UI, CharacterElement )
: base(調UI, ) : base(調UI, )
{ {
2 = this; 2 = this;

View File

@@ -16,7 +16,7 @@ namespace SlaveMatrix
public InfoPanel ip; public InfoPanel ip;
public CM ; public CharacterElement ;
public const int MaxLv = 3; public const int MaxLv = 3;
@@ -34,7 +34,7 @@ namespace SlaveMatrix
ip = 調UI.ip; ip = 調UI.ip;
} }
public B(TrainingUI 調UI, CM ) public B(TrainingUI 調UI, CharacterElement )
{ {
this.調UI = 調UI; this.調UI = 調UI;
Med = 調UI.Med; Med = 調UI.Med;

View File

@@ -164,7 +164,7 @@ namespace SlaveMatrix
{ {
} }
public (TrainingUI 調UI, CM T剃刀) public (TrainingUI 調UI, CharacterElement T剃刀)
: base(調UI, T剃刀) : base(調UI, T剃刀)
{ {
} }

View File

@@ -1470,7 +1470,7 @@ namespace SlaveMatrix
} }
} }
public (TrainingUI 調UI, CM ) public (TrainingUI 調UI, CharacterElement )
: base(調UI, ) : base(調UI, )
{ {
2 = this; 2 = this;

View File

@@ -207,7 +207,7 @@ namespace SlaveMatrix
} }
} }
public (TrainingUI 調UI, CM ) public (TrainingUI 調UI, CharacterElement )
: base(調UI, ) : base(調UI, )
{ {
2 = this; 2 = this;

View File

@@ -111,7 +111,7 @@ namespace SlaveMatrix
} }
} }
public 調(TrainingUI 調UI, CM 調) public 調(TrainingUI 調UI, CharacterElement 調)
: base(調UI, 調) : base(調UI, 調)
{ {
調 調2 = this; 調 調2 = this;

View File

@@ -2,7 +2,7 @@ using _2DGAMELIB;
namespace SlaveMatrix namespace SlaveMatrix
{ {
public class CM public class CharacterElement
{ {
private TrainingUI 調UI; private TrainingUI 調UI;
@@ -42,7 +42,7 @@ namespace SlaveMatrix
} }
} }
public CM(ModeEventDispatcher Med, TrainingUI 調UI, Element Element) public CharacterElement(ModeEventDispatcher Med, TrainingUI 調UI, Element Element)
{ {
this.調UI = 調UI; this.調UI = 調UI;
this.Element = Element; this.Element = Element;

View File

@@ -1737,9 +1737,9 @@ namespace SlaveMatrix
Player.UI.調CM.Show = Sta.GameData.PurchasedTools[5]; Player.UI.調CM.Show = Sta.GameData.PurchasedTools[5];
Player.UI.CM.Show = Sta.GameData.PurchasedTools[6]; Player.UI.CM.Show = Sta.GameData.PurchasedTools[6];
Player.UI.T剃刀CM.Show = Sta.GameData.PurchasedTools[7]; Player.UI.T剃刀CM.Show = Sta.GameData.PurchasedTools[7];
Player.UI.1CM.Show = Sta.GameData.PurchasedTools[8]; Player.UI.1CharacterElement.Show = Sta.GameData.PurchasedTools[8];
Player.UI.2CM.Show = Sta.GameData.PurchasedTools[8]; Player.UI.2CharacterElement.Show = Sta.GameData.PurchasedTools[8];
Player.UI.3CM.Show = Sta.GameData.PurchasedTools[8]; Player.UI.3CharacterElement.Show = Sta.GameData.PurchasedTools[8];
Player.UI.CM.Show = Sta.GameData.PurchasedTools[9]; Player.UI.CM.Show = Sta.GameData.PurchasedTools[9];
Player.UI.CM.Show = Sta.GameData.PurchasedTools[10]; Player.UI.CM.Show = Sta.GameData.PurchasedTools[10];
Player.UI..Dra = Sta.GameData.PurchasedTools[11]; Player.UI..Dra = Sta.GameData.PurchasedTools[11];

View File

@@ -46,25 +46,25 @@ namespace SlaveMatrix
public 1 2; public 1 2;
public 1 3; public 1 3;
public CM CM; public CharacterElement CM;
public CM CM; public CharacterElement CM;
public CM CM; public CharacterElement CM;
public CM CM; public CharacterElement CM;
public CM CM; public CharacterElement CM;
public CM CM; public CharacterElement CM;
public CM CM; public CharacterElement CM;
public CM CM; public CharacterElement CM;
public CM CM; public CharacterElement CM;
public CM CM; public CharacterElement CM;
public CM CM; public CharacterElement CM;
public CM CM; public CharacterElement CM;
public CM 調CM; public CharacterElement 調CM;
public CM T剃刀CM; public CharacterElement T剃刀CM;
public CM 1CM; public CharacterElement 1CharacterElement;
public CM 2CM; public CharacterElement 2CharacterElement;
public CM 3CM; public CharacterElement 3CharacterElement;
private CM focus; private CharacterElement focus;
private CM hcm; private CharacterElement hcm;
//tool animations? //tool animations?
public ; public ;
@@ -231,7 +231,7 @@ namespace SlaveMatrix
} }
} }
public CM Focus public CharacterElement Focus
{ {
get get
{ {
@@ -248,7 +248,7 @@ namespace SlaveMatrix
} }
} }
public CM Focus_nr public CharacterElement Focus_nr
{ {
get get
{ {
@@ -448,7 +448,7 @@ namespace SlaveMatrix
{ {
} }
public IEnumerable<CM> EnumCM() public IEnumerable<CharacterElement> EnumCM()
{ {
yield return CM; yield return CM;
yield return CM; yield return CM;
@@ -463,9 +463,9 @@ namespace SlaveMatrix
yield return CM; yield return CM;
yield return 調CM; yield return 調CM;
yield return T剃刀CM; yield return T剃刀CM;
yield return 1CM; yield return 1CharacterElement;
yield return 2CM; yield return 2CharacterElement;
yield return 3CM; yield return 3CharacterElement;
} }
public void Set挿入Position() public void Set挿入Position()
@@ -908,11 +908,11 @@ namespace SlaveMatrix
return cd.e != null; return cd.e != null;
} }
public bool Isバイブ(CM cm) public bool Isバイブ(CharacterElement CharacterElement)
{ {
if (CM != cm && CM != cm && CM != cm && CM != cm) if (CM != CharacterElement && CM != CharacterElement && CM != CharacterElement && CM != CharacterElement)
{ {
return CM == cm; return CM == CharacterElement;
} }
return true; return true;
} }
@@ -1094,17 +1094,17 @@ namespace SlaveMatrix
{ {
.Xi = 11; .Xi = 11;
} }
else if (focus == 1CM) else if (focus == 1CharacterElement)
{ {
.Xi = 5; .Xi = 5;
Set_キャップ1(); Set_キャップ1();
} }
else if (focus == 2CM) else if (focus == 2CharacterElement)
{ {
.Xi = 5; .Xi = 5;
Set_キャップ2(); Set_キャップ2();
} }
else if (focus == 3CM) else if (focus == 3CharacterElement)
{ {
.Xi = 5; .Xi = 5;
Set_キャップ3(); Set_キャップ3();
@@ -1161,15 +1161,15 @@ namespace SlaveMatrix
{ {
Set_T剃刀(); Set_T剃刀();
} }
else if (Focus == 1CM) else if (Focus == 1CharacterElement)
{ {
Set_キャップ1(); Set_キャップ1();
} }
else if (Focus == 2CM) else if (Focus == 2CharacterElement)
{ {
Set_キャップ2(); Set_キャップ2();
} }
else if (Focus == 3CM) else if (Focus == 3CharacterElement)
{ {
Set_キャップ3(); Set_キャップ3();
} }
@@ -1641,10 +1641,10 @@ namespace SlaveMatrix
Color hc_ = hc; Color hc_ = hc;
hcm = (from e in EnumCM() hcm = (from e in EnumCM()
where e.使 == UsageStatus.Standby where e.使 == UsageStatus.Standby
select e).FirstOrDefault((CM e) => e.Element.Body.IsHit(ref hc_)); select e).FirstOrDefault((CharacterElement e) => e.Element.Body.IsHit(ref hc_));
if (hcm != null) if (hcm != null)
{ {
foreach (CM item in from e in EnumCM() foreach (CharacterElement item in from e in EnumCM()
where e.使 == UsageStatus.Standby where e.使 == UsageStatus.Standby
select e) select e)
{ {
@@ -1654,7 +1654,7 @@ namespace SlaveMatrix
} }
else else
{ {
foreach (CM item2 in from e in EnumCM() foreach (CharacterElement item2 in from e in EnumCM()
where e.使 == UsageStatus.Standby && e.Element.Intensity == 1.0 where e.使 == UsageStatus.Standby && e.Element.Intensity == 1.0
select e) select e)
{ {
@@ -1677,7 +1677,7 @@ namespace SlaveMatrix
Focus.Element.Intensity = 1.0; Focus.Element.Intensity = 1.0;
} }
Out持ち手(); Out持ち手();
foreach (CM item3 in from e in EnumCM() foreach (CharacterElement item3 in from e in EnumCM()
where e.使 == UsageStatus.Standby && e.Element.Intensity == 1.0 where e.使 == UsageStatus.Standby && e.Element.Intensity == 1.0
select e) select e)
{ {
@@ -1914,9 +1914,9 @@ namespace SlaveMatrix
if (X < cp.X && cp.Y < Y) if (X < cp.X && cp.Y < Y)
{ {
Color hc_ = hc; Color hc_ = hc;
CM cM = (from e in EnumCM() CharacterElement cM = (from e in EnumCM()
where e.使 == UsageStatus.Standby where e.使 == UsageStatus.Standby
select e).FirstOrDefault((CM e) => e.Element.Body.IsHit(ref hc_)); select e).FirstOrDefault((CharacterElement e) => e.Element.Body.IsHit(ref hc_));
if (cM != null) if (cM != null)
{ {
Focus.Element.Intensity = 0.5; Focus.Element.Intensity = 0.5;
@@ -2047,17 +2047,17 @@ namespace SlaveMatrix
this.Are = Are; this.Are = Are;
double disUnit = Are.DisplayUnitScale; double disUnit = Are.DisplayUnitScale;
this.ip = ip; this.ip = ip;
CM = new CM(Med, this, = new (disUnit, .N0, Sta.GameData., Med, new D CM = new CharacterElement(Med, this, = new (disUnit, .N0, Sta.GameData., Med, new D
{ {
= 0.5, = 0.5,
C = 1.09 C = 1.09
})); }));
CM = new CM(Med, this, = new (disUnit, .N0, Sta.GameData., Med, new D CM = new CharacterElement(Med, this, = new (disUnit, .N0, Sta.GameData., Med, new D
{ {
= 0.5, = 0.5,
C = 1.09 C = 1.09
})); }));
CM = new CM(Med, this, = new (disUnit, .N0, Sta.GameData., Med, new D CM = new CharacterElement(Med, this, = new (disUnit, .N0, Sta.GameData., Med, new D
{ {
C = 1.09, C = 1.09,
_輪1_輪外_表示 = false, _輪1_輪外_表示 = false,
@@ -2070,7 +2070,7 @@ namespace SlaveMatrix
_鎖2_表示 = false, _鎖2_表示 = false,
_鎖3_表示 = false _鎖3_表示 = false
})); }));
CM = new CM(Med, this, = new (disUnit, .N0, Sta.GameData., Med, new D CM = new CharacterElement(Med, this, = new (disUnit, .N0, Sta.GameData., Med, new D
{ {
C = 1.09, C = 1.09,
_輪1_輪外_表示 = false, _輪1_輪外_表示 = false,
@@ -2085,53 +2085,53 @@ namespace SlaveMatrix
= true = true
})); }));
.SetHitFalse(); .SetHitFalse();
CM = new CM(Med, this, = new (disUnit, .N0, null, Med, new D CM = new CharacterElement(Med, this, = new (disUnit, .N0, null, Med, new D
{ {
= 0.5, = 0.5,
C = 1.09 C = 1.09
})); }));
CM = new CM(Med, this, = new _コモン(disUnit, .N0, null, Med, new _コモンD CM = new CharacterElement(Med, this, = new _コモン(disUnit, .N0, null, Med, new _コモンD
{ {
= 0.5, = 0.5,
C = 1.09 C = 1.09
})); }));
CM = new CM(Med, this, = new _ディル(disUnit, .N0, null, Med, new _ディルD CM = new CharacterElement(Med, this, = new _ディル(disUnit, .N0, null, Med, new _ディルD
{ {
= 0.5, = 0.5,
C = 1.09 C = 1.09
})); }));
CM = new CM(Med, this, = new _アナル(disUnit, .N0, null, Med, new _アナルD CM = new CharacterElement(Med, this, = new _アナル(disUnit, .N0, null, Med, new _アナルD
{ {
= 0.5, = 0.5,
C = 1.09 C = 1.09
})); }));
CM = new CM(Med, this, = new _デンマ(disUnit, .N0, null, Med, new _デンマD CM = new CharacterElement(Med, this, = new _デンマ(disUnit, .N0, null, Med, new _デンマD
{ {
= 0.5, = 0.5,
C = 1.09 C = 1.09
})); }));
CM = new CM(Med, this, = new _ドリル(disUnit, .N0, null, Med, new _ドリルD CM = new CharacterElement(Med, this, = new _ドリル(disUnit, .N0, null, Med, new _ドリルD
{ {
= 0.5, = 0.5,
C = 1.09 C = 1.09
})); }));
CM = new CM(Med, this, = new (disUnit, .N0, null, Med, new D CM = new CharacterElement(Med, this, = new (disUnit, .N0, null, Med, new D
{ {
= 0.5, = 0.5,
C = 1.09 C = 1.09
})); }));
CM = new CM(Med, this, = new (disUnit, .N0, null, Med, new D CM = new CharacterElement(Med, this, = new (disUnit, .N0, null, Med, new D
{ {
= 0.5, = 0.5,
C = 1.09 C = 1.09
})); }));
調CM = new CM(Med, this, 調 = new 調(disUnit, .N0, null, Med, new 調D 調CM = new CharacterElement(Med, this, 調 = new 調(disUnit, .N0, null, Med, new 調D
{ {
= 0.5, = 0.5,
C = 1.09, C = 1.09,
Yi = 2 Yi = 2
})); }));
T剃刀CM = new CM(Med, this, T剃刀 = new T剃刀(disUnit, .N0, null, Med, new T剃刀D T剃刀CM = new CharacterElement(Med, this, T剃刀 = new T剃刀(disUnit, .N0, null, Med, new T剃刀D
{ {
= 0.5, = 0.5,
C = 1.09 C = 1.09
@@ -2528,9 +2528,9 @@ namespace SlaveMatrix
.B = (CM.bp = vector2D + new Vector2D(0.076533333333333, 0.0)); .B = (CM.bp = vector2D + new Vector2D(0.076533333333333, 0.0));
.B = (CM.bp = vector2D + new Vector2D(0.0574, 0.14175)); .B = (CM.bp = vector2D + new Vector2D(0.0574, 0.14175));
.B = (CM.bp = vector2D + new Vector2D(0.076533333333333, 0.17325)); .B = (CM.bp = vector2D + new Vector2D(0.076533333333333, 0.17325));
1.B = (1CM.bp = vector2D + new Vector2D(0.095666666666666, 0.1667)); 1.B = (1CharacterElement.bp = vector2D + new Vector2D(0.095666666666666, 0.1667));
2.B = (2CM.bp = vector2D + new Vector2D(0.095666666666666, 0.1807)); 2.B = (2CharacterElement.bp = vector2D + new Vector2D(0.095666666666666, 0.1807));
3.B = (3CM.bp = vector2D + new Vector2D(0.095666666666666, 0.1947)); 3.B = (3CharacterElement.bp = vector2D + new Vector2D(0.095666666666666, 0.1947));
T剃刀.B = (T剃刀CM.bp = vector2D + new Vector2D(0.0574, 0.091)); T剃刀.B = (T剃刀CM.bp = vector2D + new Vector2D(0.0574, 0.091));
.B = (CM.bp = vector2D + new Vector2D(0.076533333333333, 0.116)); .B = (CM.bp = vector2D + new Vector2D(0.076533333333333, 0.116));
調.B = (調CM.bp = vector2D + new Vector2D(0.095666666666666, 0.11025)); 調.B = (調CM.bp = vector2D + new Vector2D(0.095666666666666, 0.11025));
@@ -2765,9 +2765,9 @@ namespace SlaveMatrix
.B = (CM.bp = vector2D + new Vector2D(0.076533333333333, 0.0)); .B = (CM.bp = vector2D + new Vector2D(0.076533333333333, 0.0));
.B = (CM.bp = vector2D + new Vector2D(0.0574, 0.14175)); .B = (CM.bp = vector2D + new Vector2D(0.0574, 0.14175));
.B = (CM.bp = vector2D + new Vector2D(0.076533333333333, 0.17325)); .B = (CM.bp = vector2D + new Vector2D(0.076533333333333, 0.17325));
1.B = (1CM.bp = vector2D + new Vector2D(0.095666666666666, 0.1667)); 1.B = (1CharacterElement.bp = vector2D + new Vector2D(0.095666666666666, 0.1667));
2.B = (2CM.bp = vector2D + new Vector2D(0.095666666666666, 0.1807)); 2.B = (2CharacterElement.bp = vector2D + new Vector2D(0.095666666666666, 0.1807));
3.B = (3CM.bp = vector2D + new Vector2D(0.095666666666666, 0.1947)); 3.B = (3CharacterElement.bp = vector2D + new Vector2D(0.095666666666666, 0.1947));
T剃刀.B = (T剃刀CM.bp = vector2D + new Vector2D(0.0574, 0.091)); T剃刀.B = (T剃刀CM.bp = vector2D + new Vector2D(0.0574, 0.091));
.B = (CM.bp = vector2D + new Vector2D(0.076533333333333, 0.116)); .B = (CM.bp = vector2D + new Vector2D(0.076533333333333, 0.116));
調.B = (調CM.bp = vector2D + new Vector2D(0.095666666666666, 0.11025)); 調.B = (調CM.bp = vector2D + new Vector2D(0.095666666666666, 0.11025));
@@ -2799,7 +2799,7 @@ namespace SlaveMatrix
{ {
focus.0(Are); focus.0(Are);
focus.1(Are); focus.1(Are);
if (! || ((focus == 1CM || focus == 2CM || focus == 3CM) && (.Isキャップ1着() || .Isキャップ2左着() || .Isキャップ2右着()) && !focus.DraShow)) if (! || ((focus == 1CharacterElement || focus == 2CharacterElement || focus == 3CharacterElement) && (.Isキャップ1着() || .Isキャップ2左着() || .Isキャップ2右着()) && !focus.DraShow))
{ {
CM.(Are); CM.(Are);
} }
@@ -2932,7 +2932,7 @@ namespace SlaveMatrix
} }
CM.(Are); CM.(Are);
CM.(Are); CM.(Are);
if (!i肛f && !Is乳弄り && (! || ((focus == 1CM || focus == 2CM || focus == 3CM) && (.Isキャップ1着() || .Isキャップ2左着() || .Isキャップ2右着()) && !focus.DraShow))) if (!i肛f && !Is乳弄り && (! || ((focus == 1CharacterElement || focus == 2CharacterElement || focus == 3CharacterElement) && (.Isキャップ1着() || .Isキャップ2左着() || .Isキャップ2右着()) && !focus.DraShow)))
{ {
CM.(Are); CM.(Are);
} }
@@ -2946,9 +2946,9 @@ namespace SlaveMatrix
CM.(Are); CM.(Are);
調CM.(Are); 調CM.(Are);
T剃刀CM.(Are); T剃刀CM.(Are);
1CM.(Are); 1CharacterElement.(Are);
2CM.(Are); 2CharacterElement.(Are);
3CM.(Are); 3CharacterElement.(Are);
調.Draw(Are); 調.Draw(Are);
.Draw(Are); .Draw(Are);
.Draw(Are); .Draw(Are);