Few progress on 1080p support
This commit is contained in:
0auBSQ
parent
6ebac32e6b
commit
d1a7eff7f5
1
.gitignore
vendored
1
.gitignore
vendored
@ -46,5 +46,6 @@
|
||||
/Test/System/BasicStyle
|
||||
/Test/System/OpenSkin
|
||||
/Test/System/SimpleStyle - コピー
|
||||
/Test/System/Open-World Memories
|
||||
/Test/Global/Characters/Don
|
||||
*.score.ini
|
||||
|
||||
@ -770,11 +770,11 @@ namespace TJAPlayer3
|
||||
|
||||
this.soundCrownIn = new Cシステムサウンド(@"Sounds\ResultScreen\CrownIn.ogg", false, false, false, ESoundGroup.SoundEffect);
|
||||
this.soundRankIn = new Cシステムサウンド(@"Sounds\ResultScreen\RankIn.ogg", false, false, false, ESoundGroup.SoundEffect);
|
||||
this.soundDonClear = new Cシステムサウンド(@"Sounds\ResultScreen\Donchan_Clear.ogg", false, false,true, ESoundGroup.Voice);
|
||||
this.soundDonClear = new Cシステムサウンド(@"Sounds\ResultScreen\Donchan_Clear.ogg", false, false, true, ESoundGroup.Voice);
|
||||
this.soundDonFailed = new Cシステムサウンド(@"Sounds\ResultScreen\Donchan_Miss.ogg", false, false, true, ESoundGroup.Voice);
|
||||
|
||||
this.soundSelectAnnounce = new Cシステムサウンド(@"Sounds\DiffSelect.ogg", false, false, true, ESoundGroup.Voice);
|
||||
this.sound特訓再生音 = new Cシステムサウンド(@"Sounds\Resume.ogg", false, false,false, ESoundGroup.SoundEffect);
|
||||
this.sound特訓再生音 = new Cシステムサウンド(@"Sounds\Resume.ogg", false, false, false, ESoundGroup.SoundEffect);
|
||||
this.sound特訓停止音 = new Cシステムサウンド(@"Sounds\Pause.ogg", false, false, false, ESoundGroup.SoundEffect);
|
||||
this.sound特訓スクロール音 = new Cシステムサウンド(@"Sounds\Scroll.ogg", false, false, false, ESoundGroup.SoundEffect);
|
||||
this.sound特訓ジャンプポイント = new Cシステムサウンド(@"Sounds\Jump Point.ogg", false, false, false, ESoundGroup.SoundEffect);
|
||||
@ -1174,13 +1174,13 @@ namespace TJAPlayer3
|
||||
else if (strCommand == "ResultScoreP1Y")
|
||||
{
|
||||
this.nResultScoreP1Y = C変換.n値を文字列から取得して返す(strParam, 252);
|
||||
}
|
||||
//-----------------------------
|
||||
}
|
||||
//-----------------------------
|
||||
#endregion
|
||||
|
||||
|
||||
|
||||
|
||||
#region 新・SkinConfig
|
||||
|
||||
|
||||
#region Config
|
||||
else if (strCommand == nameof(Config_ItemText_Correction_X))
|
||||
{
|
||||
@ -1189,9 +1189,9 @@ namespace TJAPlayer3
|
||||
else if (strCommand == nameof(Config_ItemText_Correction_Y))
|
||||
{
|
||||
Config_ItemText_Correction_Y = int.Parse(strParam);
|
||||
}
|
||||
}
|
||||
#endregion
|
||||
|
||||
|
||||
#region SongSelect
|
||||
else if (strCommand == "SongSelect_Overall_Y")
|
||||
{
|
||||
@ -1339,9 +1339,9 @@ namespace TJAPlayer3
|
||||
else if (strCommand == nameof(SongSelect_Rotate_Chara))
|
||||
{
|
||||
SongSelect_Rotate_Chara = strParam.Split(',').ToArray();
|
||||
}
|
||||
}
|
||||
#endregion
|
||||
|
||||
|
||||
#region SongLoading
|
||||
else if (strCommand == nameof(SongLoading_Plate_X))
|
||||
{
|
||||
@ -1607,9 +1607,9 @@ namespace TJAPlayer3
|
||||
else if (strCommand == "Game_Mob_Ptn_Beat")
|
||||
{
|
||||
ParseInt32(value => Game_Mob_Ptn_Beat = value);
|
||||
}
|
||||
}
|
||||
#endregion
|
||||
|
||||
|
||||
#region Score
|
||||
else if (strCommand == "Game_Score_X")
|
||||
{
|
||||
@ -1671,9 +1671,9 @@ namespace TJAPlayer3
|
||||
{
|
||||
Game_Score_Size[i] = int.Parse(strSplit[i]);
|
||||
}
|
||||
}
|
||||
}
|
||||
#endregion
|
||||
|
||||
|
||||
#region Taiko
|
||||
else if (strCommand == "Game_Taiko_NamePlate_X")
|
||||
{
|
||||
@ -1833,9 +1833,9 @@ namespace TJAPlayer3
|
||||
else if (strCommand == nameof(Game_Taiko_Combo_Ex_IsJumping))
|
||||
{
|
||||
Game_Taiko_Combo_Ex_IsJumping = C変換.bONorOFF(strParam[0]);
|
||||
}
|
||||
}
|
||||
#endregion
|
||||
|
||||
|
||||
#region Gauge
|
||||
else if (strCommand == "Game_Gauge_Rainbow_Timer")
|
||||
{
|
||||
@ -1843,9 +1843,9 @@ namespace TJAPlayer3
|
||||
{
|
||||
Game_Gauge_Rainbow_Timer = int.Parse(strParam);
|
||||
}
|
||||
}
|
||||
}
|
||||
#endregion
|
||||
|
||||
|
||||
#region Balloon
|
||||
else if (strCommand == "Game_Balloon_Combo_X")
|
||||
{
|
||||
@ -2029,10 +2029,10 @@ namespace TJAPlayer3
|
||||
else if (strCommand == "Game_Balloon_Balloon_Number_Scale")
|
||||
{
|
||||
ParseInt32(value => Game_Balloon_Balloon_Number_Scale = value);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
#endregion
|
||||
|
||||
|
||||
#region Effects
|
||||
else if (strCommand == nameof(Game_Effect_Roll_StartPoint_X))
|
||||
{
|
||||
@ -2173,9 +2173,9 @@ namespace TJAPlayer3
|
||||
else if (strCommand == nameof(Game_Effect_FireWorks_Timing))
|
||||
{
|
||||
Game_Effect_FireWorks_Timing = int.Parse(strParam);
|
||||
}
|
||||
}
|
||||
#endregion
|
||||
|
||||
|
||||
#region Runner
|
||||
else if (strCommand == "Game_Runner_Size")
|
||||
{
|
||||
@ -2215,9 +2215,9 @@ namespace TJAPlayer3
|
||||
{
|
||||
Game_Runner_Timer = int.Parse(strParam);
|
||||
}
|
||||
}
|
||||
}
|
||||
#endregion
|
||||
|
||||
|
||||
#region Dan_C
|
||||
else if (strCommand == nameof(Game_DanC_Title_ForeColor))
|
||||
{
|
||||
@ -2395,11 +2395,11 @@ namespace TJAPlayer3
|
||||
else if (strCommand == nameof(Game_Training_BigNumber_Width))
|
||||
{
|
||||
Game_Training_BigNumber_Width = int.Parse(strParam);
|
||||
}
|
||||
}
|
||||
#endregion
|
||||
|
||||
|
||||
#endregion
|
||||
|
||||
|
||||
#region Result
|
||||
else if (strCommand == nameof(Result_MusicName_X))
|
||||
{
|
||||
@ -2489,10 +2489,10 @@ namespace TJAPlayer3
|
||||
else if (strCommand == nameof(Result_Dan_Plate_XY))
|
||||
{
|
||||
Result_Dan_Plate_XY = strParam.Split(',').Select(int.Parse).ToArray();
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
#endregion
|
||||
|
||||
|
||||
#region Font
|
||||
else if (strCommand == nameof(Font_Edge_Ratio)) //Config画面や簡易メニューのフォントについて(rhimm)
|
||||
{
|
||||
@ -2745,6 +2745,21 @@ 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 };
|
||||
|
||||
#endregion
|
||||
|
||||
#region [Title Screen]
|
||||
public int Title_LoadingPinInstances = 5;
|
||||
public int Title_LoadingPinFrameCount = 8;
|
||||
public int Title_LoadingPinCycle = 320;
|
||||
public int[] Title_LoadingPinBase = new int[] { 480, 410 };
|
||||
public int[] Title_LoadingPinDiff = new int[] { 90, 0 };
|
||||
|
||||
#endregion
|
||||
|
||||
|
||||
#region SongSelect
|
||||
public int SongSelect_Overall_Y = 123;
|
||||
|
||||
@ -4677,7 +4677,7 @@ namespace TJAPlayer3
|
||||
/// <param name="InputText"></param>
|
||||
private void t難易度別ヘッダ(string InputText)
|
||||
{
|
||||
if (TJAPlayer3.actEnumSongs.b活性化してない)
|
||||
if (TJAPlayer3.actEnumSongs != null && TJAPlayer3.actEnumSongs.b活性化してない)
|
||||
{
|
||||
if (InputText.Equals("#HBSCROLL") && TJAPlayer3.ConfigIni.bスクロールモードを上書き == false)
|
||||
{
|
||||
|
||||
@ -430,29 +430,50 @@ namespace TJAPlayer3
|
||||
{
|
||||
TJAPlayer3.Tx.Tile_Black.Opacity = this.ctバナパス読み込み成功.n現在の値 <= 2972 ? 128 : 128 - (this.ctバナパス読み込み成功.n現在の値 - 2972);
|
||||
|
||||
for (int i = 0; i < 1280 / TJAPlayer3.Tx.Tile_Black.szテクスチャサイズ.Width + 1; i++)
|
||||
for (int j = 0; j < 720 / TJAPlayer3.Tx.Tile_Black.szテクスチャサイズ.Height + 1; j++)
|
||||
for (int i = 0; i < TJAPlayer3.Skin.Resolution[0] / TJAPlayer3.Tx.Tile_Black.szテクスチャサイズ.Width + 1; i++)
|
||||
for (int j = 0; j < TJAPlayer3.Skin.Resolution[1] / TJAPlayer3.Tx.Tile_Black.szテクスチャサイズ.Height + 1; j++)
|
||||
TJAPlayer3.Tx.Tile_Black.t2D描画(TJAPlayer3.app.Device, i * TJAPlayer3.Tx.Tile_Black.szテクスチャサイズ.Width, j * TJAPlayer3.Tx.Tile_Black.szテクスチャサイズ.Height);
|
||||
|
||||
TJAPlayer3.Tx.Banapas_Load[0].Opacity = ctバナパス読み込み成功.n現在の値 >= 872 ? 255 - (ctバナパス読み込み成功.n現在の値 - 872) * 2 : ctバナパス読み込み成功.n現在の値 * 2;
|
||||
TJAPlayer3.Tx.Banapas_Load[0].vc拡大縮小倍率.Y = ctバナパス読み込み成功.n現在の値 <= 100 ? ctバナパス読み込み成功.n現在の値 * 0.01f : 1.0f;
|
||||
TJAPlayer3.Tx.Banapas_Load[0].t2D拡大率考慮中央基準描画(TJAPlayer3.app.Device, 640, 360);
|
||||
TJAPlayer3.Tx.Banapas_Load[0].t2D描画(TJAPlayer3.app.Device, 0, 0);
|
||||
|
||||
TJAPlayer3.Tx.Banapas_Load[1].Opacity = ctバナパス読み込み成功.n現在の値 >= 872 ? 255 - (ctバナパス読み込み成功.n現在の値 - 872) * 2 : ctバナパス読み込み成功.n現在の値 <= 96 ? (int)((ctバナパス読み込み成功.n現在の値 - 96) * 7.96875f) : 255;
|
||||
TJAPlayer3.Tx.Banapas_Load[1].t2D拡大率考慮中央基準描画(TJAPlayer3.app.Device, 640, 360);
|
||||
TJAPlayer3.Tx.Banapas_Load[1].t2D描画(TJAPlayer3.app.Device, 0, 0);
|
||||
|
||||
for (int i = 0; i < 5; i++)
|
||||
if (TJAPlayer3.Tx.Banapas_Load[2] != null)
|
||||
{
|
||||
TJAPlayer3.Tx.Banapas_Load[2].Opacity = ctバナパス読み込み成功.n現在の値 >= 872 ? 255 - (ctバナパス読み込み成功.n現在の値 - 872) * 2 : ctバナパス読み込み成功.n現在の値 <= 96 ? (int)((ctバナパス読み込み成功.n現在の値 - 96) * 7.96875f) : 255;
|
||||
TJAPlayer3.Tx.Banapas_Load[2].t2D拡大率考慮中央基準描画(TJAPlayer3.app.Device, 480 + 90 * i, 410, new Rectangle(0 + 72 * (ctバナパス読み込み成功.n現在の値 >= 200 + (i - 1) * 320 ? ctバナパス読み込み成功.n現在の値 <= (200 + i * 320) ? (ctバナパス読み込み成功.n現在の値 - (200 + i * 320)) / 40 : 0 : 0), 0, 72, 72));
|
||||
}
|
||||
int step = TJAPlayer3.Tx.Banapas_Load[2].szテクスチャサイズ.Width / TJAPlayer3.Skin.Title_LoadingPinFrameCount;
|
||||
int cycle = TJAPlayer3.Skin.Title_LoadingPinCycle;
|
||||
int _stamp = (ctバナパス読み込み成功.n現在の値 - 200) % (TJAPlayer3.Skin.Title_LoadingPinInstances * cycle);
|
||||
|
||||
for (int i = 0; i < TJAPlayer3.Skin.Title_LoadingPinInstances; i++)
|
||||
{
|
||||
TJAPlayer3.Tx.Banapas_Load[2].Opacity = ctバナパス読み込み成功.n現在の値 >= 872 ? 255 - (ctバナパス読み込み成功.n現在の値 - 872) * 2 : ctバナパス読み込み成功.n現在の値 <= 96 ? (int)((ctバナパス読み込み成功.n現在の値 - 96) * 7.96875f) : 255;
|
||||
|
||||
|
||||
TJAPlayer3.Tx.Banapas_Load[2].t2D拡大率考慮中央基準描画(TJAPlayer3.app.Device,
|
||||
TJAPlayer3.Skin.Title_LoadingPinBase[0] + TJAPlayer3.Skin.Title_LoadingPinDiff[0] * i,
|
||||
TJAPlayer3.Skin.Title_LoadingPinBase[1] + TJAPlayer3.Skin.Title_LoadingPinDiff[1] * i,
|
||||
new Rectangle(step
|
||||
* (_stamp >= i * cycle
|
||||
? _stamp <= (i + 1) * cycle
|
||||
? (_stamp + i * cycle) / (cycle / TJAPlayer3.Skin.Title_LoadingPinFrameCount)
|
||||
: 0
|
||||
: 0),
|
||||
0,
|
||||
step,
|
||||
TJAPlayer3.Tx.Banapas_Load[2].szテクスチャサイズ.Height));
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
if (bバナパス読み込み失敗)
|
||||
{
|
||||
TJAPlayer3.Tx.Tile_Black.Opacity = this.ctバナパス読み込み失敗.n現在の値 <= 1000 ? 128 : 128 - (this.ctバナパス読み込み失敗.n現在の値 - 1000);
|
||||
|
||||
for (int i = 0; i < 1280 / TJAPlayer3.Tx.Tile_Black.szテクスチャサイズ.Width + 1; i++)
|
||||
for (int j = 0; j < 720 / TJAPlayer3.Tx.Tile_Black.szテクスチャサイズ.Height + 1; j++)
|
||||
for (int i = 0; i < TJAPlayer3.Skin.Resolution[0] / TJAPlayer3.Tx.Tile_Black.szテクスチャサイズ.Width + 1; i++)
|
||||
for (int j = 0; j < TJAPlayer3.Skin.Resolution[1] / TJAPlayer3.Tx.Tile_Black.szテクスチャサイズ.Height + 1; j++)
|
||||
TJAPlayer3.Tx.Tile_Black.t2D描画(TJAPlayer3.app.Device, i * TJAPlayer3.Tx.Tile_Black.szテクスチャサイズ.Width, j * TJAPlayer3.Tx.Tile_Black.szテクスチャサイズ.Height);
|
||||
|
||||
if (!TJAPlayer3.Skin.soundError.bPlayed)
|
||||
@ -461,7 +482,7 @@ namespace TJAPlayer3
|
||||
int count = this.ctバナパス読み込み失敗.n現在の値;
|
||||
TJAPlayer3.Tx.Banapas_Load_Failure[0].Opacity = count >= 872 ? 255 - (count - 872) * 2 : count * 2;
|
||||
TJAPlayer3.Tx.Banapas_Load_Failure[0].vc拡大縮小倍率.Y = count <= 100 ? count * 0.01f : 1.0f;
|
||||
TJAPlayer3.Tx.Banapas_Load_Failure[0].t2D拡大率考慮中央基準描画(TJAPlayer3.app.Device, 640, 360);
|
||||
TJAPlayer3.Tx.Banapas_Load_Failure[0].t2D描画(TJAPlayer3.app.Device, 0, 0);
|
||||
|
||||
if (ctバナパス読み込み失敗.n現在の値 >= 1128)
|
||||
{
|
||||
@ -476,8 +497,8 @@ namespace TJAPlayer3
|
||||
{
|
||||
TJAPlayer3.Tx.Tile_Black.Opacity = this.ctバナパス読み込み成功.n現在の値 <= 2972 ? 128 : 128 - (this.ctバナパス読み込み成功.n現在の値 - 2972);
|
||||
|
||||
for (int i = 0; i < 1280 / TJAPlayer3.Tx.Tile_Black.szテクスチャサイズ.Width + 1; i++)
|
||||
for (int j = 0; j < 720 / TJAPlayer3.Tx.Tile_Black.szテクスチャサイズ.Height + 1; j++)
|
||||
for (int i = 0; i < TJAPlayer3.Skin.Resolution[0] / TJAPlayer3.Tx.Tile_Black.szテクスチャサイズ.Width + 1; i++)
|
||||
for (int j = 0; j < TJAPlayer3.Skin.Resolution[1] / TJAPlayer3.Tx.Tile_Black.szテクスチャサイズ.Height + 1; j++)
|
||||
TJAPlayer3.Tx.Tile_Black.t2D描画(TJAPlayer3.app.Device, i * TJAPlayer3.Tx.Tile_Black.szテクスチャサイズ.Width, j * TJAPlayer3.Tx.Tile_Black.szテクスチャサイズ.Height);
|
||||
|
||||
if (!TJAPlayer3.Skin.SoundBanapas.bPlayed)
|
||||
@ -486,7 +507,7 @@ namespace TJAPlayer3
|
||||
int count = this.ctバナパス読み込み成功.n現在の値 - 1000;
|
||||
TJAPlayer3.Tx.Banapas_Load_Clear[0].Opacity = count >= 1872 ? 255 - (count - 1872) * 2 : count * 2;
|
||||
TJAPlayer3.Tx.Banapas_Load_Clear[0].vc拡大縮小倍率.Y = count <= 100 ? count * 0.01f : 1.0f;
|
||||
TJAPlayer3.Tx.Banapas_Load_Clear[0].t2D拡大率考慮中央基準描画(TJAPlayer3.app.Device, 640, 360);
|
||||
TJAPlayer3.Tx.Banapas_Load_Clear[0].t2D描画(TJAPlayer3.app.Device, 0, 0);
|
||||
|
||||
float anime = 0f;
|
||||
float scalex = 0f;
|
||||
@ -636,10 +657,10 @@ namespace TJAPlayer3
|
||||
//TJAPlayer3.Tx.Entry_Donchan_Normal[ctどんちゃんループ.n現在の値].t2D描画(TJAPlayer3.app.Device, -200 + DonchanX, 341 - DonchanY);
|
||||
CMenuCharacter.tMenuDisplayCharacter(player, chara_x, chara_y, CMenuCharacter.ECharacterAnimation.ENTRY_NORMAL);
|
||||
|
||||
int puchi_x = player == 0 ? 0 + 100 : 981 + 250;
|
||||
int puchi_y = player == 0 ? 330 + 230 : 330 + 230;
|
||||
int puchi_x = TJAPlayer3.Skin.Characters_Menu_X[_charaId][player] + TJAPlayer3.Skin.Adjustments_MenuPuchichara_X[player];
|
||||
int puchi_y = TJAPlayer3.Skin.Characters_Menu_Y[_charaId][player] + TJAPlayer3.Skin.Adjustments_MenuPuchichara_Y[player];
|
||||
|
||||
this.PuchiChara.On進行描画(puchi_x, puchi_y, false, player: player);
|
||||
this.PuchiChara.On進行描画(puchi_x, puchi_y, false, player: player);
|
||||
}
|
||||
|
||||
#endregion
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user