Taiko_Stuff/OpenTaiko
1
0
Fork 0
mirror of synced 2024-12-01 02:27:21 +01:00
Code Releases Activity

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

Browse Source
This commit is contained in:
0auBSQ 2023-06-21 20:06:44 +09:00
commit d09c828bae
2 changed files with 37 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
TJAPlayer3/Stages/01.StartUp/TextureLoader.cs
View File

@ -1282,7 +1282,15 @@ namespace TJAPlayer3
} }
public int[] CreateNumberedArrayFromInt(int total)
{
int[] array = new int[total];
for (int i = 0; i < total; i++)
{
array[i] = i;
}
return array;
}
public CSkin.Cシステムサウンド VoiceSelectOggOrWav(string basePath) public CSkin.Cシステムサウンド VoiceSelectOggOrWav(string basePath)
{ {
@ -1556,20 +1564,20 @@ namespace TJAPlayer3
TJAPlayer3.Skin.Characters_Balloon_Y[i] = new int[] { 0, 297, 0, 0 }; TJAPlayer3.Skin.Characters_Balloon_Y[i] = new int[] { 0, 297, 0, 0 };
TJAPlayer3.Skin.Characters_Balloon_4P[i] = new int[] { 0, -176 }; TJAPlayer3.Skin.Characters_Balloon_4P[i] = new int[] { 0, -176 };
TJAPlayer3.Skin.Characters_Balloon_5P[i] = new int[] { 0, -168 }; TJAPlayer3.Skin.Characters_Balloon_5P[i] = new int[] { 0, -168 };
TJAPlayer3.Skin.Characters_Motion_Normal[i] = new int[] { 0 }; TJAPlayer3.Skin.Characters_Motion_Normal[i] = CreateNumberedArrayFromInt(TJAPlayer3.Skin.Characters_Normal_Ptn[i]);
TJAPlayer3.Skin.Characters_Motion_10Combo[i] = new int[] { 0 }; TJAPlayer3.Skin.Characters_Motion_10Combo[i] = CreateNumberedArrayFromInt(TJAPlayer3.Skin.Characters_10Combo_Ptn[i]);
TJAPlayer3.Skin.Characters_Motion_10ComboMax[i] = new int[] { 0 }; TJAPlayer3.Skin.Characters_Motion_10ComboMax[i] = CreateNumberedArrayFromInt(TJAPlayer3.Skin.Characters_10Combo_Maxed_Ptn[i]);
TJAPlayer3.Skin.Characters_Motion_Miss[i] = new int[] { 0 }; TJAPlayer3.Skin.Characters_Motion_Miss[i] = CreateNumberedArrayFromInt(TJAPlayer3.Skin.Characters_Normal_Missed_Ptn[i]);
TJAPlayer3.Skin.Characters_Motion_MissDown[i] = new int[] { 0 }; TJAPlayer3.Skin.Characters_Motion_MissDown[i] = CreateNumberedArrayFromInt(TJAPlayer3.Skin.Characters_Normal_MissedDown_Ptn[i]);
TJAPlayer3.Skin.Characters_Motion_ClearIn[i] = new int[] { 0 }; TJAPlayer3.Skin.Characters_Motion_ClearIn[i] = CreateNumberedArrayFromInt(TJAPlayer3.Skin.Characters_Become_Cleared_Ptn[i]);
TJAPlayer3.Skin.Characters_Motion_Clear[i] = new int[] { 0 }; TJAPlayer3.Skin.Characters_Motion_Clear[i] = CreateNumberedArrayFromInt(TJAPlayer3.Skin.Characters_Normal_Cleared_Ptn[i]);
TJAPlayer3.Skin.Characters_Motion_ClearMax[i] = new int[] { 0 }; TJAPlayer3.Skin.Characters_Motion_ClearMax[i] = CreateNumberedArrayFromInt(TJAPlayer3.Skin.Characters_Normal_Maxed_Ptn[i]);
TJAPlayer3.Skin.Characters_Motion_GoGoStart[i] = new int[] { 0 }; TJAPlayer3.Skin.Characters_Motion_GoGoStart[i] = CreateNumberedArrayFromInt(TJAPlayer3.Skin.Characters_GoGoStart_Ptn[i]);
TJAPlayer3.Skin.Characters_Motion_GoGoStartMax[i] = new int[] { 0 }; TJAPlayer3.Skin.Characters_Motion_GoGoStartMax[i] = CreateNumberedArrayFromInt(TJAPlayer3.Skin.Characters_GoGoStart_Maxed_Ptn[i]);
TJAPlayer3.Skin.Characters_Motion_GoGo[i] = new int[] { 0 }; TJAPlayer3.Skin.Characters_Motion_GoGo[i] = CreateNumberedArrayFromInt(TJAPlayer3.Skin.Characters_GoGoTime_Ptn[i]);
TJAPlayer3.Skin.Characters_Motion_GoGoMax[i] = new int[] { 0 }; TJAPlayer3.Skin.Characters_Motion_GoGoMax[i] = CreateNumberedArrayFromInt(TJAPlayer3.Skin.Characters_GoGoTime_Maxed_Ptn[i]);
TJAPlayer3.Skin.Characters_Motion_SoulIn[i] = new int[] { 0 }; TJAPlayer3.Skin.Characters_Motion_SoulIn[i] = CreateNumberedArrayFromInt(TJAPlayer3.Skin.Characters_Become_Maxed_Ptn[i]);
TJAPlayer3.Skin.Characters_Motion_Return[i] = new int[] { 0 }; TJAPlayer3.Skin.Characters_Motion_Return[i] = CreateNumberedArrayFromInt(TJAPlayer3.Skin.Characters_Return_Ptn[i]);
TJAPlayer3.Skin.Characters_Beat_Normal[i] = 1; TJAPlayer3.Skin.Characters_Beat_Normal[i] = 1;
TJAPlayer3.Skin.Characters_Beat_Miss[i] = 1; TJAPlayer3.Skin.Characters_Beat_Miss[i] = 1;
TJAPlayer3.Skin.Characters_Beat_MissDown[i] = 1; TJAPlayer3.Skin.Characters_Beat_MissDown[i] = 1;

28
TJAPlayer3/Stages/07.Game/Taiko/CAct演奏Drumsキャラクター.cs
View File

@ -187,7 +187,7 @@ namespace TJAPlayer3
{ {
updateNormal(); updateNormal();
ReturnDefaultAnime(i, false); ReturnDefaultAnime(i, false);
nowChara = TJAPlayer3.Tx.Characters_Normal[Character][nNowCharaFrame[i]]; nowChara = TJAPlayer3.Tx.Characters_Normal[Character][TJAPlayer3.Skin.Characters_Motion_Normal[Character][nNowCharaFrame[i]]];
if (endAnime) if (endAnime)
{ {
nNowCharaCounter[i] = 0; nNowCharaCounter[i] = 0;
@ -199,7 +199,7 @@ namespace TJAPlayer3
{ {
updateNormal(); updateNormal();
ReturnDefaultAnime(i, false); ReturnDefaultAnime(i, false);
nowChara = TJAPlayer3.Tx.Characters_Normal_Missed[Character][nNowCharaFrame[i]]; nowChara = TJAPlayer3.Tx.Characters_Normal_Missed[Character][TJAPlayer3.Skin.Characters_Motion_Miss[Character][nNowCharaFrame[i]]];
if (endAnime) if (endAnime)
{ {
nNowCharaCounter[i] = 0; nNowCharaCounter[i] = 0;
@ -211,7 +211,7 @@ namespace TJAPlayer3
{ {
updateNormal(); updateNormal();
ReturnDefaultAnime(i, false); ReturnDefaultAnime(i, false);
nowChara = TJAPlayer3.Tx.Characters_Normal_MissedDown[Character][nNowCharaFrame[i]]; nowChara = TJAPlayer3.Tx.Characters_Normal_MissedDown[Character][TJAPlayer3.Skin.Characters_Motion_MissDown[Character][nNowCharaFrame[i]]];
if (endAnime) if (endAnime)
{ {
nNowCharaCounter[i] = 0; nNowCharaCounter[i] = 0;
@ -223,7 +223,7 @@ namespace TJAPlayer3
{ {
updateNormal(); updateNormal();
ReturnDefaultAnime(i, false); ReturnDefaultAnime(i, false);
nowChara = TJAPlayer3.Tx.Characters_Normal_Cleared[Character][nNowCharaFrame[i]]; nowChara = TJAPlayer3.Tx.Characters_Normal_Cleared[Character][TJAPlayer3.Skin.Characters_Motion_Clear[Character][nNowCharaFrame[i]]];
if (endAnime) if (endAnime)
{ {
nNowCharaCounter[i] = 0; nNowCharaCounter[i] = 0;
@ -235,7 +235,7 @@ namespace TJAPlayer3
{ {
updateNormal(); updateNormal();
ReturnDefaultAnime(i, false); ReturnDefaultAnime(i, false);
nowChara = TJAPlayer3.Tx.Characters_Normal_Maxed[Character][nNowCharaFrame[i]]; nowChara = TJAPlayer3.Tx.Characters_Normal_Maxed[Character][TJAPlayer3.Skin.Characters_Motion_ClearMax[Character][nNowCharaFrame[i]]];
if (endAnime) if (endAnime)
{ {
nNowCharaCounter[i] = 0; nNowCharaCounter[i] = 0;
@ -247,7 +247,7 @@ namespace TJAPlayer3
{ {
updateNormal(); updateNormal();
ReturnDefaultAnime(i, false); ReturnDefaultAnime(i, false);
nowChara = TJAPlayer3.Tx.Characters_GoGoTime[Character][nNowCharaFrame[i]]; nowChara = TJAPlayer3.Tx.Characters_GoGoTime[Character][TJAPlayer3.Skin.Characters_Motion_GoGo[Character][nNowCharaFrame[i]]];
if (endAnime) if (endAnime)
{ {
nNowCharaCounter[i] = 0; nNowCharaCounter[i] = 0;
@ -259,7 +259,7 @@ namespace TJAPlayer3
{ {
updateNormal(); updateNormal();
ReturnDefaultAnime(i, false); ReturnDefaultAnime(i, false);
nowChara = TJAPlayer3.Tx.Characters_GoGoTime_Maxed[Character][nNowCharaFrame[i]]; nowChara = TJAPlayer3.Tx.Characters_GoGoTime_Maxed[Character][TJAPlayer3.Skin.Characters_Motion_GoGoMax[Character][nNowCharaFrame[i]]];
if (endAnime) if (endAnime)
{ {
nNowCharaCounter[i] = 0; nNowCharaCounter[i] = 0;
@ -272,7 +272,7 @@ namespace TJAPlayer3
updateNormal(); updateNormal();
if (TJAPlayer3.Tx.Characters_10Combo[Character] != null && TJAPlayer3.Skin.Characters_10Combo_Ptn[Character] != 0) if (TJAPlayer3.Tx.Characters_10Combo[Character] != null && TJAPlayer3.Skin.Characters_10Combo_Ptn[Character] != 0)
{ {
nowChara = TJAPlayer3.Tx.Characters_10Combo[Character][nNowCharaFrame[i]]; nowChara = TJAPlayer3.Tx.Characters_10Combo[Character][TJAPlayer3.Skin.Characters_Motion_10Combo[Character][nNowCharaFrame[i]]];
} }
if (endAnime) if (endAnime)
{ {
@ -285,7 +285,7 @@ namespace TJAPlayer3
updateNormal(); updateNormal();
if (TJAPlayer3.Tx.Characters_10Combo_Maxed[Character] != null && TJAPlayer3.Skin.Characters_10Combo_Maxed_Ptn[Character] != 0) if (TJAPlayer3.Tx.Characters_10Combo_Maxed[Character] != null && TJAPlayer3.Skin.Characters_10Combo_Maxed_Ptn[Character] != 0)
{ {
nowChara = TJAPlayer3.Tx.Characters_10Combo_Maxed[Character][nNowCharaFrame[i]]; nowChara = TJAPlayer3.Tx.Characters_10Combo_Maxed[Character][TJAPlayer3.Skin.Characters_Motion_10ComboMax[Character][nNowCharaFrame[i]]];
} }
if (endAnime) if (endAnime)
{ {
@ -298,7 +298,7 @@ namespace TJAPlayer3
updateNormal(); updateNormal();
if (TJAPlayer3.Tx.Characters_GoGoStart[Character] != null && TJAPlayer3.Skin.Characters_GoGoStart_Ptn[Character] != 0) if (TJAPlayer3.Tx.Characters_GoGoStart[Character] != null && TJAPlayer3.Skin.Characters_GoGoStart_Ptn[Character] != 0)
{ {
nowChara = TJAPlayer3.Tx.Characters_GoGoStart[Character][nNowCharaFrame[i]]; nowChara = TJAPlayer3.Tx.Characters_GoGoStart[Character][TJAPlayer3.Skin.Characters_Motion_GoGoStart[Character][nNowCharaFrame[i]]];
} }
if (endAnime) if (endAnime)
{ {
@ -311,7 +311,7 @@ namespace TJAPlayer3
updateNormal(); updateNormal();
if (TJAPlayer3.Tx.Characters_GoGoStart_Maxed[Character] != null && TJAPlayer3.Skin.Characters_GoGoStart_Maxed_Ptn[Character] != 0) if (TJAPlayer3.Tx.Characters_GoGoStart_Maxed[Character] != null && TJAPlayer3.Skin.Characters_GoGoStart_Maxed_Ptn[Character] != 0)
{ {
nowChara = TJAPlayer3.Tx.Characters_GoGoStart_Maxed[Character][nNowCharaFrame[i]]; nowChara = TJAPlayer3.Tx.Characters_GoGoStart_Maxed[Character][TJAPlayer3.Skin.Characters_Motion_GoGoStartMax[Character][nNowCharaFrame[i]]];
} }
if (endAnime) if (endAnime)
{ {
@ -324,7 +324,7 @@ namespace TJAPlayer3
updateNormal(); updateNormal();
if (TJAPlayer3.Tx.Characters_Become_Cleared[Character] != null && TJAPlayer3.Skin.Characters_Become_Cleared_Ptn[Character] != 0) if (TJAPlayer3.Tx.Characters_Become_Cleared[Character] != null && TJAPlayer3.Skin.Characters_Become_Cleared_Ptn[Character] != 0)
{ {
nowChara = TJAPlayer3.Tx.Characters_Become_Cleared[Character][nNowCharaFrame[i]]; nowChara = TJAPlayer3.Tx.Characters_Become_Cleared[Character][TJAPlayer3.Skin.Characters_Motion_ClearIn[Character][nNowCharaFrame[i]]];
} }
if (endAnime) if (endAnime)
{ {
@ -337,7 +337,7 @@ namespace TJAPlayer3
updateNormal(); updateNormal();
if (TJAPlayer3.Tx.Characters_Become_Maxed[Character] != null && TJAPlayer3.Skin.Characters_Become_Maxed_Ptn[Character] != 0) if (TJAPlayer3.Tx.Characters_Become_Maxed[Character] != null && TJAPlayer3.Skin.Characters_Become_Maxed_Ptn[Character] != 0)
{ {
nowChara = TJAPlayer3.Tx.Characters_Become_Maxed[Character][nNowCharaFrame[i]]; nowChara = TJAPlayer3.Tx.Characters_Become_Maxed[Character][TJAPlayer3.Skin.Characters_Motion_SoulIn[Character][nNowCharaFrame[i]]];
} }
if (endAnime) if (endAnime)
{ {
@ -350,7 +350,7 @@ namespace TJAPlayer3
updateNormal(); updateNormal();
if (TJAPlayer3.Tx.Characters_Return[Character] != null && TJAPlayer3.Skin.Characters_Return_Ptn[Character] != 0) if (TJAPlayer3.Tx.Characters_Return[Character] != null && TJAPlayer3.Skin.Characters_Return_Ptn[Character] != 0)
{ {
nowChara = TJAPlayer3.Tx.Characters_Return[Character][nNowCharaFrame[i]]; nowChara = TJAPlayer3.Tx.Characters_Return[Character][TJAPlayer3.Skin.Characters_Motion_Return[Character][nNowCharaFrame[i]]];
} }
if (endAnime) if (endAnime)
{ {