Taiko_Stuff/OpenTaiko
1
0
Fork 0
mirror of synced 2025-02-17 19:09:25 +01:00
Code Releases Activity

Attach song select characters to nameplate and fix their puchicharas

Browse Source
This commit is contained in:
0auBSQ 2023-01-28 20:42:14 +09:00
parent 928d685ad7
commit ca38a13955
4 changed files with 33 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
TJAPlayer3/Character/CMenuCharacter.cs
View File

@ -233,58 +233,47 @@ namespace TJAPlayer3
// Quick fix
if (_ctref[player].n現在の値 >= _ref.Length) return;
// Expend if substitute to match menu size
if (_substitute)
{
_ref[_ctref[player].n現在の値].vc拡大縮小倍率.X = 1.3f;
_ref[_ctref[player].n現在の値].vc拡大縮小倍率.Y = 1.3f;
}
else
{
_ref[_ctref[player].n現在の値].vc拡大縮小倍率.X = 1.0f;
_ref[_ctref[player].n現在の値].vc拡大縮小倍率.Y = 1.0f;
}
var _tex = _ref[_ctref[player].n現在の値];
_ref[_ctref[player].n現在の値].Opacity = opacity;
_tex.Opacity = opacity;
float resolutionRatioX = TJAPlayer3.Skin.Resolution[0] / (float)TJAPlayer3.Skin.Characters_Resolution[_charaId][0];
float resolutionRatioY = TJAPlayer3.Skin.Resolution[1] / (float)TJAPlayer3.Skin.Characters_Resolution[_charaId][1];
float _x = (x + (150.0f * (TJAPlayer3.Skin.Characters_Resolution[_charaId][0] / 1280.0f))) * resolutionRatioX;
float _y = (y + (((_substitute == true) ? 290 : _ref[_ctref[player].n現在の値].szテクスチャサイズ.Height)) * (TJAPlayer3.Skin.Characters_Resolution[_charaId][1] / 720.0f)) * resolutionRatioY;
//float _x = (x + (150.0f * (TJAPlayer3.Skin.Characters_Resolution[_charaId][0] / 1280.0f))) * resolutionRatioX;
//float _y = (y + (((_substitute == true) ? 290 : _ref[_ctref[player].n現在の値].szテクスチャサイズ.Height)) * (TJAPlayer3.Skin.Characters_Resolution[_charaId][1] / 720.0f)) * resolutionRatioY;
_ref[_ctref[player].n現在の値].vc拡大縮小倍率.X *= resolutionRatioY;
_ref[_ctref[player].n現在の値].vc拡大縮小倍率.Y *= resolutionRatioY;
_tex.vc拡大縮小倍率.X *= resolutionRatioX;
_tex.vc拡大縮小倍率.Y *= resolutionRatioY;
float _x = x;
float _y = y;
if (player % 2 == 0)
{
//_ref[_ctref[player].n現在の値].t2D描画(TJAPlayer3.app.Device, x, y);
//_ref[_ctref[player].n現在の値].t2D中心基準描画(TJAPlayer3.app.Device, x + 150, y + 156);
_ref[_ctref[player].n現在の値].t2D拡大率考慮下中心基準描画(TJAPlayer3.app.Device,
_tex.t2D拡大率考慮下中心基準描画(TJAPlayer3.app.Device,
_x,
_y // 312
);
}
else
{
//_ref[_ctref[player].n現在の値].t2D左右反転描画(TJAPlayer3.app.Device, x, y);
//_ref[_ctref[player].n現在の値].t2D中心基準描画Mirrored(TJAPlayer3.app.Device, x + 150, y + 156);
_ref[_ctref[player].n現在の値].t2D拡大率考慮下中心基準描画Mirrored(TJAPlayer3.app.Device,
_tex.t2D拡大率考慮下中心基準描画Mirrored(TJAPlayer3.app.Device,
_x,
_y // 312
);
}
// Restore if substitute to avoid breaking in-game display
if (_substitute)
{
_ref[_ctref[player].n現在の値].vc拡大縮小倍率.X = 1f;
_ref[_ctref[player].n現在の値].vc拡大縮小倍率.Y = 1f;
}
_ref[_ctref[player].n現在の値].Opacity = 255;
_tex.Opacity = 255;
}

4
TJAPlayer3/Common/CSkin.cs
View File

@ -5615,8 +5615,8 @@ namespace TJAPlayer3
#endregion
#region [Adjustments]
public int[] Adjustments_MenuPuchichara_X = new int[] { 100, 250, 100, 250 };
public int[] Adjustments_MenuPuchichara_Y = new int[] { 230, 230, 230, 230 };
public int[] Adjustments_MenuPuchichara_X = new int[] { -100, 100, -100, 100 };
public int[] Adjustments_MenuPuchichara_Y = new int[] { -100, -100, -100, -100 };
#endregion

7
TJAPlayer3/Stages/05.DaniSelect/CStage段位選択.cs
View File

@ -208,7 +208,12 @@ namespace TJAPlayer3
// TJAPlayer3.Tx.SongSelect_Donchan_Normal[ctDonchan_Normal.n現在の値].Opacity = ctDonchan_In.n現在の値 * 2;
// TJAPlayer3.Tx.SongSelect_Donchan_Normal[ctDonchan_Normal.n現在の値].t2D描画(TJAPlayer3.app.Device, -200 + DonchanX, 336 - DonchanY);
CMenuCharacter.tMenuDisplayCharacter(0, (int)(-200 + DonchanX), (int)(336 - DonchanY), CMenuCharacter.ECharacterAnimation.NORMAL);
//CMenuCharacter.tMenuDisplayCharacter(0, (int)(-200 + DonchanX), (int)(336 - DonchanY), CMenuCharacter.ECharacterAnimation.NORMAL);
CMenuCharacter.tMenuDisplayCharacter(
0,
TJAPlayer3.Skin.SongSelect_NamePlate_X[0] + TJAPlayer3.Tx.NamePlateBase.szテクスチャサイズ.Width / 2,
TJAPlayer3.Skin.SongSelect_NamePlate_Y[0],
CMenuCharacter.ECharacterAnimation.NORMAL);
#region [PuchiChara]

14
TJAPlayer3/Stages/05.SongSelect/CStage選曲.cs
View File

@ -512,11 +512,17 @@ namespace TJAPlayer3
int _charaId = TJAPlayer3.NamePlateConfig.data.Character[TJAPlayer3.GetActualPlayer(player)];
int chara_x = TJAPlayer3.Skin.Characters_Menu_X[_charaId][player];
int chara_y = TJAPlayer3.Skin.Characters_Menu_Y[_charaId][player];
//int chara_x = TJAPlayer3.Skin.Characters_Menu_X[_charaId][player];
//int chara_y = TJAPlayer3.Skin.Characters_Menu_Y[_charaId][player];
int puchi_x = player == 0 ? 0 + 100 : 981 + 250;
int puchi_y = player == 0 ? 330 + 230 : 330 + 230;
int chara_x = TJAPlayer3.Skin.SongSelect_NamePlate_X[player] + TJAPlayer3.Tx.NamePlateBase.szテクスチャサイズ.Width / 2;
int chara_y = TJAPlayer3.Skin.SongSelect_NamePlate_Y[player];
//int puchi_x = player == 0 ? 0 + 100 : 981 + 250;
//int puchi_y = player == 0 ? 330 + 230 : 330 + 230;
int puchi_x = chara_x + TJAPlayer3.Skin.Adjustments_MenuPuchichara_X[player];
int puchi_y = chara_y + TJAPlayer3.Skin.Adjustments_MenuPuchichara_Y[player];
if (___cc != null && ___cc.b終了値に達してない)
{