Taiko_Stuff/OpenTaiko
1
0
Fork 0
mirror of synced 2024-11-28 01:10:53 +01:00
Code Releases Activity

Fix result screen character and puchichara

Browse Source
This commit is contained in:
0auBSQ 2023-01-30 00:49:13 +09:00
parent f0f70f1578
commit c02937ac86
3 changed files with 46 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
TJAPlayer3/Character/CResultCharacter.cs
View File

@ -222,55 +222,45 @@ namespace TJAPlayer3
// Quick fix // Quick fix
if (_ctref[player].n現在の値 >= _ref.Length) return; if (_ctref[player].n現在の値 >= _ref.Length) return;
// x0.8 if not substitute var _tex = _ref[_ctref[player].n現在の値];
if (!_substitute)
{
_ref[_ctref[player].n現在の値].vc拡大縮小倍率.X = 0.8f;
_ref[_ctref[player].n現在の値].vc拡大縮小倍率.Y = 0.8f;
}
else
{
_ref[_ctref[player].n現在の値].vc拡大縮小倍率.X = 1.0f;
_ref[_ctref[player].n現在の値].vc拡大縮小倍率.Y = 1.0f;
}
_ref[_ctref[player].n現在の値].Opacity = opacity; _tex.Opacity = opacity;
float resolutionRatioX = TJAPlayer3.Skin.Resolution[0] / (float)TJAPlayer3.Skin.Characters_Resolution[_charaId][0]; 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 resolutionRatioY = TJAPlayer3.Skin.Resolution[1] / (float)TJAPlayer3.Skin.Characters_Resolution[_charaId][1];
//202 //202
float _x = (x - (((_substitute == true) ? 20 : 40) * (TJAPlayer3.Skin.Characters_Resolution[_charaId][0] / 1280.0f))) * resolutionRatioX; //float _x = (x - (((_substitute == true) ? 20 : 40) * (TJAPlayer3.Skin.Characters_Resolution[_charaId][0] / 1280.0f))) * resolutionRatioX;
//532 //532
float _y = (y - (((_substitute == true) ? 20 : 40) * (TJAPlayer3.Skin.Characters_Resolution[_charaId][1] / 720.0f))) * resolutionRatioY; //float _y = (y - (((_substitute == true) ? 20 : 40) * (TJAPlayer3.Skin.Characters_Resolution[_charaId][1] / 720.0f))) * resolutionRatioY;
_ref[_ctref[player].n現在の値].vc拡大縮小倍率.X *= resolutionRatioY; float _x = x;
_ref[_ctref[player].n現在の値].vc拡大縮小倍率.Y *= resolutionRatioY; float _y = y;
_tex.vc拡大縮小倍率.X *= resolutionRatioX;
_tex.vc拡大縮小倍率.Y *= resolutionRatioY;
if (pos % 2 == 0) if (pos % 2 == 0)
{ {
_ref[_ctref[player].n現在の値].t2D拡大率考慮中央基準描画(TJAPlayer3.app.Device, _tex.t2D拡大率考慮下中心基準描画(TJAPlayer3.app.Device,
_x, _x,
_y _y
); );
} }
else else
{ {
_ref[_ctref[player].n現在の値].t2D拡大率考慮中央基準描画Mirrored(TJAPlayer3.app.Device, _tex.t2D拡大率考慮下中心基準描画Mirrored(TJAPlayer3.app.Device,
_x, _x,
_y _y
); );
} }
// Restore if not substitute _tex.vc拡大縮小倍率.X = 1f;
if (!_substitute) _tex.vc拡大縮小倍率.Y = 1f;
{
_ref[_ctref[player].n現在の値].vc拡大縮小倍率.X = 1f;
_ref[_ctref[player].n現在の値].vc拡大縮小倍率.Y = 1f;
}
_ref[_ctref[player].n現在の値].Opacity = 255;
_tex.Opacity = 255;
} }

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

@ -203,21 +203,29 @@ namespace TJAPlayer3
float DonchanX = 0f, DonchanY = 0f; float DonchanX = 0f, DonchanY = 0f;
DonchanX = (float)Math.Sin(ctDonchan_In.n現在の値 / 2 * (Math.PI / 180)) * 200f; DonchanX = (float)Math.Sin(ctDonchan_In.n現在の値 / 2 * (Math.PI / 180)) * 200f;
DonchanY = ((float)Math.Sin((90 + (ctDonchan_In.n現在の値 / 2)) * (Math.PI / 180)) * 150f); DonchanY = ((float)Math.Sin((90 + (ctDonchan_In.n現在の値 / 2)) * (Math.PI / 180)) * 150f);
// TJAPlayer3.Tx.SongSelect_Donchan_Normal[ctDonchan_Normal.n現在の値].Opacity = ctDonchan_In.n現在の値 * 2; // 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); // 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);
int chara_x = TJAPlayer3.Skin.SongSelect_NamePlate_X[0] + TJAPlayer3.Tx.NamePlateBase.szテクスチャサイズ.Width / 2;
int chara_y = TJAPlayer3.Skin.SongSelect_NamePlate_Y[0];
CMenuCharacter.tMenuDisplayCharacter( CMenuCharacter.tMenuDisplayCharacter(
0, 0,
TJAPlayer3.Skin.SongSelect_NamePlate_X[0] + TJAPlayer3.Tx.NamePlateBase.szテクスチャサイズ.Width / 2, chara_x,
TJAPlayer3.Skin.SongSelect_NamePlate_Y[0], chara_y,
CMenuCharacter.ECharacterAnimation.NORMAL); CMenuCharacter.ECharacterAnimation.NORMAL);
#region [PuchiChara] #region [PuchiChara]
int puchi_x = chara_x + TJAPlayer3.Skin.Adjustments_MenuPuchichara_X[0];
int puchi_y = chara_y + TJAPlayer3.Skin.Adjustments_MenuPuchichara_Y[0];
this.PuchiChara.On進行描画(0 + 100, 336 + 230, false); //this.PuchiChara.On進行描画(0 + 100, 336 + 230, false);
this.PuchiChara.On進行描画(puchi_x, puchi_y, false);
#endregion #endregion
} }

25
TJAPlayer3/Stages/08.Result/CActResultParameterPanel.cs
View File

@ -753,10 +753,14 @@ namespace TJAPlayer3
int _charaId = TJAPlayer3.NamePlateConfig.data.Character[TJAPlayer3.GetActualPlayer(p)]; int _charaId = TJAPlayer3.NamePlateConfig.data.Character[TJAPlayer3.GetActualPlayer(p)];
int chara_x = TJAPlayer3.Skin.Characters_Result_X[_charaId][pos]; //int chara_x = TJAPlayer3.Skin.Characters_Result_X[_charaId][pos];
int chara_y = TJAPlayer3.Skin.Characters_Result_Y[_charaId][pos]; //int chara_y = TJAPlayer3.Skin.Characters_Result_Y[_charaId][pos];
if (CResultCharacter.tIsCounterProcessing(p, CResultCharacter.ECharacterResult.CLEAR)) int chara_x = TJAPlayer3.Skin.Result_NamePlate_X[pos] + TJAPlayer3.Tx.NamePlateBase.szテクスチャサイズ.Width / 2;
int chara_y = TJAPlayer3.Skin.Result_NamePlate_Y[pos];
if (CResultCharacter.tIsCounterProcessing(p, CResultCharacter.ECharacterResult.CLEAR))
CResultCharacter.tMenuDisplayCharacter(p, chara_x, chara_y, CResultCharacter.ECharacterResult.CLEAR, pos); CResultCharacter.tMenuDisplayCharacter(p, chara_x, chara_y, CResultCharacter.ECharacterResult.CLEAR, pos);
else if (CResultCharacter.tIsCounterProcessing(p, CResultCharacter.ECharacterResult.FAILED)) else if (CResultCharacter.tIsCounterProcessing(p, CResultCharacter.ECharacterResult.FAILED))
CResultCharacter.tMenuDisplayCharacter(p, chara_x, chara_y, CResultCharacter.ECharacterResult.FAILED, pos); CResultCharacter.tMenuDisplayCharacter(p, chara_x, chara_y, CResultCharacter.ECharacterResult.FAILED, pos);
@ -770,14 +774,19 @@ namespace TJAPlayer3
#region [PuchiChara] #region [PuchiChara]
int ttdiff = 640 - 152; int puchi_x = chara_x + TJAPlayer3.Skin.Adjustments_MenuPuchichara_X[pos];
int ttps = 640 + ((pos == 1) ? ttdiff + 60 : -ttdiff); int puchi_y = chara_y + TJAPlayer3.Skin.Adjustments_MenuPuchichara_Y[pos];
this.PuchiChara.On進行描画(ttps, 562, false, 255, false, p); //int ttdiff = 640 - 152;
//int ttps = 640 + ((pos == 1) ? ttdiff + 60 : -ttdiff);
#endregion //this.PuchiChara.On進行描画(ttps, 562, false, 255, false, p);
if (ct全体進行.n現在の値 >= MountainAppearValue) this.PuchiChara.On進行描画(puchi_x, puchi_y, false, 255, false, p);
#endregion
if (ct全体進行.n現在の値 >= MountainAppearValue)
{ {
float AddCount = 135; float AddCount = 135;