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

Merge branch 'main' of https://github.com/0auBSQ/OpenTaiko

Browse Source
This commit is contained in:
0auBSQ 2022-11-27 15:23:05 +09:00
commit 6b7c3dd4c0
6 changed files with 265 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

141
TJAPlayer3/Common/CSkin.cs
View File

@ -2478,6 +2478,14 @@ namespace TJAPlayer3
if (int.Parse(strParam) > 0) if (int.Parse(strParam) > 0)
SongLoading_SubTitle_FontSize = int.Parse(strParam); SongLoading_SubTitle_FontSize = int.Parse(strParam);
} }
else if (strCommand == "SongLoading_Chara_Move")
{
string[] strSplit = strParam.Split(',');
for (int i = 0; i < 2; i++)
{
SongLoading_Chara_Move[i] = int.Parse(strSplit[i]);
}
}
else if (strCommand == nameof(SongLoading_Plate_ReferencePoint)) else if (strCommand == nameof(SongLoading_Plate_ReferencePoint))
{ {
SongLoading_Plate_ReferencePoint = (ReferencePoint)int.Parse(strParam); SongLoading_Plate_ReferencePoint = (ReferencePoint)int.Parse(strParam);
@ -3594,6 +3602,117 @@ namespace TJAPlayer3
#endregion #endregion
#region Heya
else if (strCommand == "Heya_Main_Menu_X")
{
string[] strSplit = strParam.Split(',');
for (int i = 0; i < 5; i++)
{
Heya_Main_Menu_X[i] = int.Parse(strSplit[i]);
}
}
else if (strCommand == "Heya_Main_Menu_Y")
{
string[] strSplit = strParam.Split(',');
for (int i = 0; i < 5; i++)
{
Heya_Main_Menu_Y[i] = int.Parse(strSplit[i]);
}
}
else if (strCommand == "Heya_Main_Menu_Font_Offset")
{
string[] strSplit = strParam.Split(',');
for (int i = 0; i < 5; i++)
{
Heya_Main_Menu_Font_Offset[i] = int.Parse(strSplit[i]);
}
}
else if (strCommand == "Heya_Font_Scale")
{
Heya_Font_Scale = int.Parse(strParam);
}
else if (strCommand == "Heya_Center_Menu_Box_Count")
{
Heya_Center_Menu_Box_Count = int.Parse(strParam);
}
else if (strCommand == "Heya_Center_Menu_Box_X")
{
string[] strSplit = strParam.Split(',');
for (int i = 0; i < Heya_Center_Menu_Box_Count; i++)
{
Heya_Center_Menu_Box_X[i] = int.Parse(strSplit[i]);
}
}
else if (strCommand == "Heya_Center_Menu_Box_Y")
{
string[] strSplit = strParam.Split(',');
for (int i = 0; i < Heya_Center_Menu_Box_Count; i++)
{
Heya_Center_Menu_Box_Y[i] = int.Parse(strSplit[i]);
}
}
else if (strCommand == "Heya_Center_Menu_Box_Item_Offset")
{
string[] strSplit = strParam.Split(',');
for (int i = 0; i < 2; i++)
{
Heya_Center_Menu_Box_Item_Offset[i] = int.Parse(strSplit[i]);
}
}
else if (strCommand == "Heya_Center_Menu_Box_Name_Offset")
{
string[] strSplit = strParam.Split(',');
for (int i = 0; i < 2; i++)
{
Heya_Center_Menu_Box_Name_Offset[i] = int.Parse(strSplit[i]);
}
}
else if (strCommand == "Heya_Center_Menu_Box_Authors_Offset")
{
string[] strSplit = strParam.Split(',');
for (int i = 0; i < 2; i++)
{
Heya_Center_Menu_Box_Authors_Offset[i] = int.Parse(strSplit[i]);
}
}
else if (strCommand == "Heya_Side_Menu_Count")
{
Heya_Side_Menu_Count = int.Parse(strParam);
}
else if (strCommand == "Heya_Side_Menu_X")
{
string[] strSplit = strParam.Split(',');
for (int i = 0; i < Heya_Side_Menu_Count; i++)
{
Heya_Side_Menu_X[i] = int.Parse(strSplit[i]);
}
}
else if (strCommand == "Heya_Side_Menu_Y")
{
string[] strSplit = strParam.Split(',');
for (int i = 0; i < Heya_Side_Menu_Count; i++)
{
Heya_Side_Menu_Y[i] = int.Parse(strSplit[i]);
}
}
else if (strCommand == "Heya_Side_Menu_Font_Offset")
{
string[] strSplit = strParam.Split(',');
for (int i = 0; i < 2; i++)
{
Heya_Side_Menu_Font_Offset[i] = int.Parse(strSplit[i]);
}
}
else if (strCommand == "Heya_InfoSection")
{
string[] strSplit = strParam.Split(',');
for (int i = 0; i < 2; i++)
{
Heya_InfoSection[i] = int.Parse(strSplit[i]);
}
}
#endregion
#region Font #region Font
else if (strCommand == nameof(Font_Edge_Ratio)) //Config画面や簡易メニューのフォントについて(rhimm) else if (strCommand == nameof(Font_Edge_Ratio)) //Config画面や簡易メニューのフォントについて(rhimm)
{ {
@ -4126,6 +4245,7 @@ namespace TJAPlayer3
public int SongLoading_SubTitle_Y = 325; public int SongLoading_SubTitle_Y = 325;
public int SongLoading_Title_FontSize = 31; public int SongLoading_Title_FontSize = 31;
public int SongLoading_SubTitle_FontSize = 20; public int SongLoading_SubTitle_FontSize = 20;
public int[] SongLoading_Chara_Move = new int[] { 250, -80 };
public ReferencePoint SongLoading_Plate_ReferencePoint = ReferencePoint.Center; public ReferencePoint SongLoading_Plate_ReferencePoint = ReferencePoint.Center;
public ReferencePoint SongLoading_Title_ReferencePoint = ReferencePoint.Center; public ReferencePoint SongLoading_Title_ReferencePoint = ReferencePoint.Center;
public ReferencePoint SongLoading_SubTitle_ReferencePoint = ReferencePoint.Center; public ReferencePoint SongLoading_SubTitle_ReferencePoint = ReferencePoint.Center;
@ -4426,6 +4546,27 @@ namespace TJAPlayer3
public int[] Result_Dan_XY = new int[] { 0, 420 }; public int[] Result_Dan_XY = new int[] { 0, 420 };
public int[] Result_Dan_Plate_XY = new int[] { 149, 149 }; public int[] Result_Dan_Plate_XY = new int[] { 149, 149 };
#endregion #endregion
#region Heya
public int[] Heya_Main_Menu_X = new int[] { 164, 164, 164, 164, 164 };
public int[] Heya_Main_Menu_Y = new int[] { 26, 106, 186, 266, 346 };
public int[] Heya_Main_Menu_Font_Offset = new int[] { 0, 14 };
public int Heya_Center_Menu_Box_Count = 11;
public int[] Heya_Center_Menu_Box_X = new int[] { -890, -588, -286, 16, 318, 620, 922, 1224, 1526, 1828, 2130 };
public int[] Heya_Center_Menu_Box_Y = new int[] { 200, 200, 200, 200, 200, 200, 200, 200, 200, 200, 200 };
public int[] Heya_Center_Menu_Box_Item_Offset = new int[] { 0, 120 };
public int[] Heya_Center_Menu_Box_Name_Offset = new int[] { 0, 234 };
public int[] Heya_Center_Menu_Box_Authors_Offset = new int[] { 0, 260 };
public int Heya_Side_Menu_Count = 13;
public int[] Heya_Side_Menu_X = new int[] { 670, 680, 690, 700, 710, 720, 730, 720, 710, 700, 690, 680, 670 };
public int[] Heya_Side_Menu_Y = new int[] { -80, -10, 60, 130, 200, 270, 340, 410, 480, 550, 620, 690, 760 };
public int[] Heya_Side_Menu_Font_Offset = new int[] { 0, 14 };
public int[] Heya_InfoSection = new int[] { 620, 560 };
public int Heya_Font_Scale = 14;
#endregion
#region Font #region Font
public int Font_Edge_Ratio = 30; public int Font_Edge_Ratio = 30;
public int Font_Edge_Ratio_Vertical = 30; public int Font_Edge_Ratio_Vertical = 30;

94
TJAPlayer3/Stages/11.Heya/CStageHeya.cs
View File

@ -44,9 +44,9 @@ namespace TJAPlayer3
if (!string.IsNullOrEmpty(TJAPlayer3.ConfigIni.FontName)) if (!string.IsNullOrEmpty(TJAPlayer3.ConfigIni.FontName))
this.pfHeyaFont = new CPrivateFastFont(new FontFamily(TJAPlayer3.ConfigIni.FontName), 14); this.pfHeyaFont = new CPrivateFastFont(new FontFamily(TJAPlayer3.ConfigIni.FontName), TJAPlayer3.Skin.Heya_Font_Scale);
else else
this.pfHeyaFont = new CPrivateFastFont(new FontFamily("MS UI Gothic"), 14); this.pfHeyaFont = new CPrivateFastFont(new FontFamily("MS UI Gothic"), TJAPlayer3.Skin.Heya_Font_Scale);
ScrollCounter = new CCounter(0, 1000, 0.15f, TJAPlayer3.Timer); ScrollCounter = new CCounter(0, 1000, 0.15f, TJAPlayer3.Timer);
@ -199,8 +199,8 @@ namespace TJAPlayer3
TJAPlayer3.Tx.Heya_Side_Menu?.tUpdateColor4(C変換.ColorToColor4(Color.White)); TJAPlayer3.Tx.Heya_Side_Menu?.tUpdateColor4(C変換.ColorToColor4(Color.White));
} }
TJAPlayer3.Tx.Heya_Side_Menu?.t2D拡大率考慮上中央基準描画(TJAPlayer3.app.Device, 164, 26 + 80 * i); TJAPlayer3.Tx.Heya_Side_Menu?.t2D拡大率考慮上中央基準描画(TJAPlayer3.app.Device, TJAPlayer3.Skin.Heya_Main_Menu_X[i], TJAPlayer3.Skin.Heya_Main_Menu_Y[i]);
tmpTex.t2D拡大率考慮上中央基準描画(TJAPlayer3.app.Device, 164, 40 + 80 * i); tmpTex.t2D拡大率考慮上中央基準描画(TJAPlayer3.app.Device, TJAPlayer3.Skin.Heya_Main_Menu_X[i] + TJAPlayer3.Skin.Heya_Main_Menu_Font_Offset[0], TJAPlayer3.Skin.Heya_Main_Menu_Y[i] + TJAPlayer3.Skin.Heya_Main_Menu_Font_Offset[1]);
} }
#endregion #endregion
@ -209,7 +209,7 @@ namespace TJAPlayer3
if (iCurrentMenu == 0) if (iCurrentMenu == 0)
{ {
for (int i = -5; i < 6; i++) for (int i = -(TJAPlayer3.Skin.Heya_Center_Menu_Box_Count / 2); i < (TJAPlayer3.Skin.Heya_Center_Menu_Box_Count / 2) + 1; i++)
{ {
int pos = (iPuchiCharaCount * 5 + iPuchiCharaCurrent + i) % iPuchiCharaCount; int pos = (iPuchiCharaCount * 5 + iPuchiCharaCurrent + i) % iPuchiCharaCount;
@ -226,12 +226,13 @@ namespace TJAPlayer3
TJAPlayer3.Tx.Heya_Lock?.tUpdateColor4(C変換.ColorToColor4(Color.White)); TJAPlayer3.Tx.Heya_Lock?.tUpdateColor4(C変換.ColorToColor4(Color.White));
} }
var scroll = DrawBox_Slot(i); var scroll = DrawBox_Slot(i + (TJAPlayer3.Skin.Heya_Center_Menu_Box_Count / 2));
int puriColumn = pos % 5; int puriColumn = pos % 5;
int puriRow = pos / 5; int puriRow = pos / 5;
TJAPlayer3.Tx.Puchichara[pos].tx?.t2D拡大率考慮中央基準描画(TJAPlayer3.app.Device, (620 + 302 * i) + scroll, 320 + (int)(PuchiChara.sineY), TJAPlayer3.Tx.Puchichara[pos].tx?.t2D拡大率考慮中央基準描画(TJAPlayer3.app.Device, scroll.Item1 + TJAPlayer3.Skin.Heya_Center_Menu_Box_Item_Offset[0],
scroll.Item2 + TJAPlayer3.Skin.Heya_Center_Menu_Box_Item_Offset[1] + (int)(PuchiChara.sineY),
new Rectangle((PuchiChara.Counter.n現在の値 + 2 * puriColumn) * TJAPlayer3.Skin.Game_PuchiChara[0], new Rectangle((PuchiChara.Counter.n現在の値 + 2 * puriColumn) * TJAPlayer3.Skin.Game_PuchiChara[0],
puriRow * TJAPlayer3.Skin.Game_PuchiChara[1], puriRow * TJAPlayer3.Skin.Game_PuchiChara[1],
TJAPlayer3.Skin.Game_PuchiChara[0], TJAPlayer3.Skin.Game_PuchiChara[0],
@ -245,19 +246,21 @@ namespace TJAPlayer3
{ {
CTexture tmpTex = TJAPlayer3.stage選曲.act曲リスト.ResolveTitleTexture(ttkPuchiCharaNames[pos]); CTexture tmpTex = TJAPlayer3.stage選曲.act曲リスト.ResolveTitleTexture(ttkPuchiCharaNames[pos]);
tmpTex.t2D拡大率考慮上中央基準描画(TJAPlayer3.app.Device, (620 + 302 * i) + scroll, 434); tmpTex.t2D拡大率考慮上中央基準描画(TJAPlayer3.app.Device, scroll.Item1 + TJAPlayer3.Skin.Heya_Center_Menu_Box_Name_Offset[0],
scroll.Item2 + TJAPlayer3.Skin.Heya_Center_Menu_Box_Name_Offset[1]);
} }
if (ttkPuchiCharaAuthors[pos] != null) if (ttkPuchiCharaAuthors[pos] != null)
{ {
CTexture tmpTex = TJAPlayer3.stage選曲.act曲リスト.ResolveTitleTexture(ttkPuchiCharaAuthors[pos]); CTexture tmpTex = TJAPlayer3.stage選曲.act曲リスト.ResolveTitleTexture(ttkPuchiCharaAuthors[pos]);
tmpTex.t2D拡大率考慮上中央基準描画(TJAPlayer3.app.Device, (620 + 302 * i) + scroll, 460); tmpTex.t2D拡大率考慮上中央基準描画(TJAPlayer3.app.Device, scroll.Item1 + TJAPlayer3.Skin.Heya_Center_Menu_Box_Authors_Offset[0],
scroll.Item2 + TJAPlayer3.Skin.Heya_Center_Menu_Box_Authors_Offset[1]);
} }
if (TJAPlayer3.Tx.Puchichara[pos].unlock != null if (TJAPlayer3.Tx.Puchichara[pos].unlock != null
&& !TJAPlayer3.NamePlateConfig.data.UnlockedPuchicharas[iPlayer].Contains(TJAPlayer3.Skin.Puchicharas_Name[pos])) && !TJAPlayer3.NamePlateConfig.data.UnlockedPuchicharas[iPlayer].Contains(TJAPlayer3.Skin.Puchicharas_Name[pos]))
TJAPlayer3.Tx.Heya_Lock?.t2D拡大率考慮上中央基準描画(TJAPlayer3.app.Device, (620 + 302 * i) + scroll, 200); TJAPlayer3.Tx.Heya_Lock?.t2D拡大率考慮上中央基準描画(TJAPlayer3.app.Device, scroll.Item1, scroll.Item2);
#endregion #endregion
@ -271,7 +274,7 @@ namespace TJAPlayer3
if (iCurrentMenu == 1) if (iCurrentMenu == 1)
{ {
for (int i = -5; i < 6; i++) for (int i = -(TJAPlayer3.Skin.Heya_Center_Menu_Box_Count / 2); i < (TJAPlayer3.Skin.Heya_Center_Menu_Box_Count / 2) + 1; i++)
{ {
int pos = (iCharacterCount * 5 + iCharacterCurrent + i) % iCharacterCount; int pos = (iCharacterCount * 5 + iCharacterCurrent + i) % iCharacterCount;
@ -286,9 +289,10 @@ namespace TJAPlayer3
TJAPlayer3.Tx.Heya_Center_Menu_Box_Slot?.tUpdateColor4(C変換.ColorToColor4(Color.White)); TJAPlayer3.Tx.Heya_Center_Menu_Box_Slot?.tUpdateColor4(C変換.ColorToColor4(Color.White));
} }
var scroll = DrawBox_Slot(i); var scroll = DrawBox_Slot(i + (TJAPlayer3.Skin.Heya_Center_Menu_Box_Count / 2));
TJAPlayer3.Tx.Characters_Heya_Preview[pos]?.t2D拡大率考慮中央基準描画(TJAPlayer3.app.Device, (620 + 302 * i) + scroll, 320); TJAPlayer3.Tx.Characters_Heya_Preview[pos]?.t2D拡大率考慮中央基準描画(TJAPlayer3.app.Device, scroll.Item1 + TJAPlayer3.Skin.Heya_Center_Menu_Box_Item_Offset[0],
scroll.Item2 + TJAPlayer3.Skin.Heya_Center_Menu_Box_Item_Offset[1]);
TJAPlayer3.Tx.Characters_Heya_Preview[pos]?.tUpdateColor4(C変換.ColorToColor4(Color.White)); TJAPlayer3.Tx.Characters_Heya_Preview[pos]?.tUpdateColor4(C変換.ColorToColor4(Color.White));
@ -298,14 +302,16 @@ namespace TJAPlayer3
{ {
CTexture tmpTex = TJAPlayer3.stage選曲.act曲リスト.ResolveTitleTexture(ttkCharacterNames[pos]); CTexture tmpTex = TJAPlayer3.stage選曲.act曲リスト.ResolveTitleTexture(ttkCharacterNames[pos]);
tmpTex.t2D拡大率考慮上中央基準描画(TJAPlayer3.app.Device, (620 + 302 * i) + scroll, 434); tmpTex.t2D拡大率考慮上中央基準描画(TJAPlayer3.app.Device, scroll.Item1 + TJAPlayer3.Skin.Heya_Center_Menu_Box_Name_Offset[0],
scroll.Item2 + TJAPlayer3.Skin.Heya_Center_Menu_Box_Name_Offset[1]);
} }
if (ttkCharacterAuthors[pos] != null) if (ttkCharacterAuthors[pos] != null)
{ {
CTexture tmpTex = TJAPlayer3.stage選曲.act曲リスト.ResolveTitleTexture(ttkCharacterAuthors[pos]); CTexture tmpTex = TJAPlayer3.stage選曲.act曲リスト.ResolveTitleTexture(ttkCharacterAuthors[pos]);
tmpTex.t2D拡大率考慮上中央基準描画(TJAPlayer3.app.Device, (620 + 302 * i) + scroll, 460); tmpTex.t2D拡大率考慮上中央基準描画(TJAPlayer3.app.Device, scroll.Item1 + TJAPlayer3.Skin.Heya_Center_Menu_Box_Authors_Offset[0],
scroll.Item2 + TJAPlayer3.Skin.Heya_Center_Menu_Box_Authors_Offset[1]);
} }
#endregion #endregion
@ -318,7 +324,7 @@ namespace TJAPlayer3
if (iCurrentMenu == 2) if (iCurrentMenu == 2)
{ {
for (int i = -6; i < 7; i++) for (int i = -(TJAPlayer3.Skin.Heya_Side_Menu_Count / 2); i < (TJAPlayer3.Skin.Heya_Side_Menu_Count / 2) + 1; i++)
{ {
int pos = (this.ttkDanTitles.Length * 5 + iDanTitleCurrent + i) % this.ttkDanTitles.Length; int pos = (this.ttkDanTitles.Length * 5 + iDanTitleCurrent + i) % this.ttkDanTitles.Length;
@ -343,15 +349,15 @@ namespace TJAPlayer3
danGrade = TJAPlayer3.NamePlateConfig.data.DanTitles[iPlayer][this.ttkDanTitles[pos].str文字].clearStatus; danGrade = TJAPlayer3.NamePlateConfig.data.DanTitles[iPlayer][this.ttkDanTitles[pos].str文字].clearStatus;
} }
var scroll = DrawSide_Menu(i); var scroll = DrawSide_Menu(i + (TJAPlayer3.Skin.Heya_Side_Menu_Count / 2));
TJAPlayer3.Tx.NamePlateBase.t2D拡大率考慮上中央基準描画(TJAPlayer3.app.Device, TJAPlayer3.Tx.NamePlateBase.t2D拡大率考慮上中央基準描画(TJAPlayer3.app.Device,
(718 + -10 * Math.Abs(i)) + scroll.Item1, scroll.Item1,
(331 + 70 * i) + scroll.Item2, scroll.Item2,
new RectangleF(0, (8 + danGrade) * 54, 220, 54)); new RectangleF(0, (8 + danGrade) * 54, 220, 54));
TJAPlayer3.Tx.NamePlateBase.color4 = C変換.ColorToColor4(Color.White); TJAPlayer3.Tx.NamePlateBase.color4 = C変換.ColorToColor4(Color.White);
tmpTex.t2D拡大率考慮上中央基準描画(TJAPlayer3.app.Device, (730 + -10 * Math.Abs(i)) + scroll.Item1, (354 + 70 * i) + scroll.Item2); tmpTex.t2D拡大率考慮上中央基準描画(TJAPlayer3.app.Device, scroll.Item1 + TJAPlayer3.Skin.Heya_Side_Menu_Font_Offset[0], scroll.Item2 + TJAPlayer3.Skin.Heya_Side_Menu_Font_Offset[1]);
} }
@ -363,7 +369,7 @@ namespace TJAPlayer3
if (iCurrentMenu == 3) if (iCurrentMenu == 3)
{ {
for (int i = -6; i < 7; i++) for (int i = -(TJAPlayer3.Skin.Heya_Side_Menu_Count / 2); i < (TJAPlayer3.Skin.Heya_Side_Menu_Count / 2) + 1; i++)
{ {
int pos = (this.ttkTitles.Length * 5 + iTitleCurrent + i) % this.ttkTitles.Length; int pos = (this.ttkTitles.Length * 5 + iTitleCurrent + i) % this.ttkTitles.Length;
@ -380,7 +386,7 @@ namespace TJAPlayer3
TJAPlayer3.Tx.Heya_Side_Menu.color4 = C変換.ColorToColor4(Color.White); TJAPlayer3.Tx.Heya_Side_Menu.color4 = C変換.ColorToColor4(Color.White);
} }
var scroll = DrawSide_Menu(i); var scroll = DrawSide_Menu(i + (TJAPlayer3.Skin.Heya_Side_Menu_Count / 2));
int iType = -1; int iType = -1;
@ -393,11 +399,11 @@ namespace TJAPlayer3
if (iType >= 0 && iType < TJAPlayer3.Skin.Config_NamePlate_Ptn_Title) if (iType >= 0 && iType < TJAPlayer3.Skin.Config_NamePlate_Ptn_Title)
{ {
TJAPlayer3.Tx.NamePlate_Title[iType][TJAPlayer3.NamePlate.ctAnimatedNamePlateTitle.n現在の値 % TJAPlayer3.Skin.Config_NamePlate_Ptn_Title_Boxes[iType]].t2D拡大率考慮上中央基準描画(TJAPlayer3.app.Device, TJAPlayer3.Tx.NamePlate_Title[iType][TJAPlayer3.NamePlate.ctAnimatedNamePlateTitle.n現在の値 % TJAPlayer3.Skin.Config_NamePlate_Ptn_Title_Boxes[iType]].t2D拡大率考慮上中央基準描画(TJAPlayer3.app.Device,
(730 + -10 * Math.Abs(i)) + scroll.Item1, scroll.Item1,
(348 + 70 * i) + scroll.Item2); scroll.Item2);
} }
tmpTex.t2D拡大率考慮上中央基準描画(TJAPlayer3.app.Device, (730 + -10 * Math.Abs(i)) + scroll.Item1, (354 + 70 * i) + scroll.Item2); tmpTex.t2D拡大率考慮上中央基準描画(TJAPlayer3.app.Device, scroll.Item1 + TJAPlayer3.Skin.Heya_Side_Menu_Font_Offset[0], scroll.Item2 + TJAPlayer3.Skin.Heya_Side_Menu_Font_Offset[1]);
} }
} }
@ -416,7 +422,7 @@ namespace TJAPlayer3
if (this.ttkInfoSection != null) if (this.ttkInfoSection != null)
TJAPlayer3.stage選曲.act曲リスト.ResolveTitleTexture(this.ttkInfoSection) TJAPlayer3.stage選曲.act曲リスト.ResolveTitleTexture(this.ttkInfoSection)
.t2D拡大率考慮上中央基準描画(TJAPlayer3.app.Device, 620, 560); .t2D拡大率考慮上中央基準描画(TJAPlayer3.app.Device, TJAPlayer3.Skin.Heya_InfoSection[0], TJAPlayer3.Skin.Heya_InfoSection[1]);
} }
#endregion #endregion
@ -751,23 +757,34 @@ namespace TJAPlayer3
return true; return true;
} }
private int DrawBox_Slot(int i) private (int, int) DrawBox_Slot(int i)
{ {
double value = (1.0 - Math.Sin((((ScrollCounter.n現在の値) / 2000.0)) * Math.PI)) * ScrollMode; double value = (1.0 - Math.Sin((((ScrollCounter.n現在の値) / 2000.0)) * Math.PI));
int scroll = (int)(value * BoxInterval);
TJAPlayer3.Tx.Heya_Center_Menu_Box_Slot?.t2D拡大率考慮上中央基準描画(TJAPlayer3.app.Device, (620 + BoxInterval * i) + scroll, 200); int nextIndex = i + ScrollMode;
return scroll; nextIndex = Math.Min(TJAPlayer3.Skin.Heya_Center_Menu_Box_Count - 1, nextIndex);
nextIndex = Math.Max(0, nextIndex);
int x = TJAPlayer3.Skin.Heya_Center_Menu_Box_X[i] + (int)((TJAPlayer3.Skin.Heya_Center_Menu_Box_X[nextIndex] - TJAPlayer3.Skin.Heya_Center_Menu_Box_X[i]) * value);
int y = TJAPlayer3.Skin.Heya_Center_Menu_Box_Y[i] + (int)((TJAPlayer3.Skin.Heya_Center_Menu_Box_Y[nextIndex] - TJAPlayer3.Skin.Heya_Center_Menu_Box_Y[i]) * value);
TJAPlayer3.Tx.Heya_Center_Menu_Box_Slot?.t2D拡大率考慮上中央基準描画(TJAPlayer3.app.Device, x, y);
return (x, y);
} }
private (int, int) DrawSide_Menu(int i) private (int, int) DrawSide_Menu(int i)
{ {
double value = (1.0 - Math.Sin((((ScrollCounter.n現在の値) / 2000.0)) * Math.PI)) * ScrollMode; double value = (1.0 - Math.Sin((((ScrollCounter.n現在の値) / 2000.0)) * Math.PI));
var x = (int)(value * SideInterval_X);
var modeFlag = ScrollMode == -1 ? i > 0 : i >= 0; int nextIndex = i + ScrollMode;
(int, int) scroll = (modeFlag ? -x : x, nextIndex = Math.Min(TJAPlayer3.Skin.Heya_Side_Menu_Count - 1, nextIndex);
(int)(value * SideInterval_Y)); nextIndex = Math.Max(0, nextIndex);
TJAPlayer3.Tx.Heya_Side_Menu.t2D拡大率考慮上中央基準描画(TJAPlayer3.app.Device, 730 - (SideInterval_X * Math.Abs(i)) + scroll.Item1, 340 + (SideInterval_Y * i) + scroll.Item2);
return scroll; int x = TJAPlayer3.Skin.Heya_Side_Menu_X[i] + (int)((TJAPlayer3.Skin.Heya_Side_Menu_X[nextIndex] - TJAPlayer3.Skin.Heya_Side_Menu_X[i]) * value);
int y = TJAPlayer3.Skin.Heya_Side_Menu_Y[i] + (int)((TJAPlayer3.Skin.Heya_Side_Menu_Y[nextIndex] - TJAPlayer3.Skin.Heya_Side_Menu_Y[i]) * value);
TJAPlayer3.Tx.Heya_Side_Menu.t2D拡大率考慮上中央基準描画(TJAPlayer3.app.Device, x, y);
return (x, y);
} }
#region [Unlockables] #region [Unlockables]
@ -840,7 +857,6 @@ namespace TJAPlayer3
private int iCharacterCount; private int iCharacterCount;
private CCounter ScrollCounter; private CCounter ScrollCounter;
private const int BoxInterval = 302;
private const int SideInterval_X = 10; private const int SideInterval_X = 10;
private const int SideInterval_Y = 70; private const int SideInterval_Y = 70;
private int ScrollMode; private int ScrollMode;

10
TJAPlayer3/Stages/CActFIFOStart.cs
View File

@ -176,7 +176,7 @@ namespace TJAPlayer3
TJAPlayer3.Tx.SongLoading_Plate.Opacity = (int)opacity; TJAPlayer3.Tx.SongLoading_Plate.Opacity = (int)opacity;
TJAPlayer3.Tx.SongLoading_Plate.vc拡大縮小倍率.X = scaleX; TJAPlayer3.Tx.SongLoading_Plate.vc拡大縮小倍率.X = scaleX;
TJAPlayer3.Tx.SongLoading_Plate.vc拡大縮小倍率.Y = scaleY; TJAPlayer3.Tx.SongLoading_Plate.vc拡大縮小倍率.Y = scaleY;
TJAPlayer3.Tx.SongLoading_Plate.t2D描画(TJAPlayer3.app.Device, SizeX_Harf - (SizeX_Harf * scaleX) + (1280.0f / 2.0f) - SizeX_Harf, TJAPlayer3.Skin.SongLoading_Plate_Y - SizeY_Harf + ((1f - scaleY) * SizeY_Harf)); TJAPlayer3.Tx.SongLoading_Plate.t2D描画(TJAPlayer3.app.Device, TJAPlayer3.Skin.SongLoading_Plate_X + SizeX_Harf - (SizeX_Harf * scaleX) - SizeX_Harf, TJAPlayer3.Skin.SongLoading_Plate_Y - SizeY_Harf + ((1f - scaleY) * SizeY_Harf));
} }
public void DrawChara(double time, float opacity, float X = -1, float Y = -1) public void DrawChara(double time, float opacity, float X = -1, float Y = -1)
@ -187,15 +187,15 @@ namespace TJAPlayer3
if (X == -1 && Y == -1) if (X == -1 && Y == -1)
{ {
Y = -(float)(Math.Sin((time - 680f) * (Math.PI / 320.0)) * 80f); Y = (float)(Math.Sin((time - 680f) * (Math.PI / 320.0)) * TJAPlayer3.Skin.SongLoading_Chara_Move[1]);
X = (float)((time - 680f) / 320.0) * 250f; X = (float)((time - 680f) / 320.0) * TJAPlayer3.Skin.SongLoading_Chara_Move[0];
} }
TJAPlayer3.Tx.SongLoading_Chara.Opacity = (int)opacity; TJAPlayer3.Tx.SongLoading_Chara.Opacity = (int)opacity;
//左どんちゃん //左どんちゃん
TJAPlayer3.Tx.SongLoading_Chara.t2D描画(TJAPlayer3.app.Device, -250f + X, Y, new RectangleF(0, 0, SizeXHarf, SizeY)); TJAPlayer3.Tx.SongLoading_Chara.t2D描画(TJAPlayer3.app.Device, -TJAPlayer3.Skin.SongLoading_Chara_Move[0] + X, Y, new RectangleF(0, 0, SizeXHarf, SizeY));
//左どんちゃん //左どんちゃん
TJAPlayer3.Tx.SongLoading_Chara.t2D描画(TJAPlayer3.app.Device, SizeXHarf + 250f - X, Y, new RectangleF(SizeXHarf, 0, SizeXHarf, SizeY)); TJAPlayer3.Tx.SongLoading_Chara.t2D描画(TJAPlayer3.app.Device, SizeXHarf + TJAPlayer3.Skin.SongLoading_Chara_Move[0] - X, Y, new RectangleF(SizeXHarf, 0, SizeXHarf, SizeY));
} }
// その他 // その他

30
Test/System/SimpleStyle/HeyaConfig.ini Normal file
View File

@ -0,0 +1,30 @@
;Included file
;あとは通常通り設定できます
Heya_Main_Menu_X=164,164,164,164,164
Heya_Main_Menu_Y=26,106,186,266,346
Heya_Main_Menu_Font_Offset=0,14
Heya_Center_Menu_Box_Count=11
Heya_Center_Menu_Box_X=-890,-588,-286,16,318,620,922,1224,1526,1828,2130
Heya_Center_Menu_Box_Y=200,200,200,200,200,200,200,200,200,200,200
Heya_Center_Menu_Box_Item_Offset=0,120
Heya_Center_Menu_Box_Name_Offset=0,234
Heya_Center_Menu_Box_Authors_Offset=0,260
Heya_Side_Menu_Count=13
Heya_Side_Menu_X=670,680,690,700,710,720,730,720,710,700,690,680,670
Heya_Side_Menu_Y=-80,-10,60,130,200,270,340,410,480,550,620,690,760
Heya_Side_Menu_Font_Offset=0,14
Heya_InfoSection=620,560
Heya_Font_Scale=14

16
Test/System/SimpleStyle/SkinConfig.ini
View File

@ -1,4 +1,4 @@
;スキンの情報設定 ;スキンの情報設定
;Skin information ;Skin information
Name=OpenSkin Name=OpenSkin
Version=0.5.3.2 Version=0.5.3.2
@ -9,12 +9,14 @@ Game_Score_Size=26,34
Game_Taiko_NamePlate_X=-5,-5 Game_Taiko_NamePlate_X=-5,-5
Game_Taiko_NamePlate_Y=297,371 Game_Taiko_NamePlate_Y=297,371
; "#include ファイル名" 命令を使うことで ; "#include ファイル名" 命令を使うことで
; 外部ファイルを読み込んで使用することができるようになります ; 外部ファイルを読み込んで使用することができるようになります
#include OtherConfig.ini #include OtherConfig.ini
#include TitleConfig.ini #include TitleConfig.ini
#include ConfigConfig.ini #include ConfigConfig.ini
#include SongSelectConfig.ini #include SongSelectConfig.ini
#include HeyaConfig.ini
#include SongLoadingConfig.ini
Game_Notes_Anime=1 Game_Notes_Anime=1
@ -43,17 +45,17 @@ Game_Taiko_X=205,205
Game_Taiko_Y=206,384 Game_Taiko_Y=206,384
;ダンサーの座標(登場順) ;ダンサーの座標(登場順)
Game_Dancer_X=640,430,856,215,1070 Game_Dancer_X=640,430,856,215,1070
Game_Dancer_Y=503,503,503,503,503 Game_Dancer_Y=503,503,503,503,503
;ダンサーのモーション指定(カンマ区切り) ;ダンサーのモーション指定(カンマ区切り)
Game_Dancer_Motion=0,0,1,1,2,2,1,1,0,0,1,1,2,3,4,5,6,6,7,7,8,8,7,7,6,6,7,7,8,8,5,5,9,10,11,10,9,10,11,10,9,12,13,14,13,12,13,14,13,12,9,10,11,10,9,10,11,10,9,12,13,14,13,12,13,14,13,12 Game_Dancer_Motion=0,0,1,1,2,2,1,1,0,0,1,1,2,3,4,5,6,6,7,7,8,8,7,7,6,6,7,7,8,8,5,5,9,10,11,10,9,10,11,10,9,12,13,14,13,12,13,14,13,12,9,10,11,10,9,10,11,10,9,12,13,14,13,12,13,14,13,12
;ダンサーのモーションが何拍子でループするか(4分の4拍子換算) ;ダンサーのモーションが何拍子でループするか(4分の4拍子換算)
Game_Dancer_Beat=15 Game_Dancer_Beat=15
;ダンサーの出現タイミング(魂ゲージn%) ;ダンサーの出現タイミング(魂ゲージn%)
Game_Dancer_Gauge=0,20,40,60,80 Game_Dancer_Gauge=0,20,40,60,80
Game_Mob_Beat=1 Game_Mob_Beat=1

25
Test/System/SimpleStyle/SongLoadingConfig.ini Normal file
View File

@ -0,0 +1,25 @@
;Included file
;あとは通常通り設定できます
SongLoading_Plate_X=640
SongLoading_Plate_Y=360
SongLoading_Title_X=640
SongLoading_Title_Y=280
SongLoading_SubTitle_X=640
SongLoading_SubTitle_Y=325
SongLoading_Title_FontSize=31
SongLoading_SubTitle_FontSize=20
SongLoading_Chara_Move=250,-80