Taiko_Stuff/OpenTaiko
1
0
Fork 0
mirror of synced 2024-11-24 07:30:21 +01:00
Code Releases Activity

PuchiChara index is now configurable in the NamePlate.json file for each player

Browse Source
This commit is contained in:
0aubsq 2021-10-02 17:20:28 +02:00
parent 33c29090bd
commit 8c8cc14c9a
4 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
TJAPlayer3/Common/NamePlateConfig.cs
View File

@ -24,10 +24,12 @@ namespace TJAPlayer3
public string[] Title = { "どんちゃんですよ！", "かっちゃんですよ！" }; public string[] Title = { "どんちゃんですよ！", "かっちゃんですよ！" };
public string[] Dan = { "達人", "達人" }; public string[] Dan = { "達人", "達人" };
public bool[] DanGold = { false, true }; public bool[] DanGold = { false, false };
public int[] DanType = { 1, 2 }; public int[] DanType = { 1, 2 };
public int[] TitleType = { 1, 2 }; public int[] TitleType = { 1, 2 };
public int[] PuchiChara = { 2, 11 };
} }
public Data data = new Data(); public Data data = new Data();

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

@ -752,7 +752,7 @@ namespace TJAPlayer3
if (TJAPlayer3.ConfigIni.nPlayerCount == 2) if (TJAPlayer3.ConfigIni.nPlayerCount == 2)
{ {
TJAPlayer3.Tx.SongSelect_Donchan_Select[ctDonchan_Select.n現在の値].t2D左右反転描画(TJAPlayer3.app.Device, 981, 330); TJAPlayer3.Tx.SongSelect_Donchan_Select[ctDonchan_Select.n現在の値].t2D左右反転描画(TJAPlayer3.app.Device, 981, 330);
this.PuchiChara.On進行描画(981 + 250, 330 + 230, false); this.PuchiChara.On進行描画(981 + 250, 330 + 230, false, player : 1);
} }
TJAPlayer3.Tx.SongSelect_Donchan_Select[ctDonchan_Select.n現在の値].t2D描画(TJAPlayer3.app.Device, 0, 330); TJAPlayer3.Tx.SongSelect_Donchan_Select[ctDonchan_Select.n現在の値].t2D描画(TJAPlayer3.app.Device, 0, 330);
@ -765,12 +765,12 @@ namespace TJAPlayer3
if (this.ctDonchan_Jump[1].n現在の値 > 0) if (this.ctDonchan_Jump[1].n現在の値 > 0)
{ {
TJAPlayer3.Tx.SongSelect_Donchan_Jump[ctDonchan_Jump[1].n現在の値 >= 17 ? 17 : ctDonchan_Jump[1].n現在の値].t2D左右反転描画(TJAPlayer3.app.Device, 981, 330); TJAPlayer3.Tx.SongSelect_Donchan_Jump[ctDonchan_Jump[1].n現在の値 >= 17 ? 17 : ctDonchan_Jump[1].n現在の値].t2D左右反転描画(TJAPlayer3.app.Device, 981, 330);
this.PuchiChara.On進行描画(981 + 250, 330 + 230, false); this.PuchiChara.On進行描画(981 + 250, 330 + 230, false, player: 1);
} }
else else
{ {
TJAPlayer3.Tx.SongSelect_Donchan_Normal[ctDonchan_Normal.n現在の値].t2D左右反転描画(TJAPlayer3.app.Device, 981, 330); TJAPlayer3.Tx.SongSelect_Donchan_Normal[ctDonchan_Normal.n現在の値].t2D左右反転描画(TJAPlayer3.app.Device, 981, 330);
this.PuchiChara.On進行描画(981 + 250, 330 + 230, false); this.PuchiChara.On進行描画(981 + 250, 330 + 230, false, player: 1);
} }
} }
if (this.ctDonchan_Jump[0].n現在の値 > 0) if (this.ctDonchan_Jump[0].n現在の値 > 0)

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

@ -261,7 +261,7 @@ namespace TJAPlayer3
} }
if (this.b風船連打中[i] != true && CharaAction_Balloon_Delay[i].b終了値に達した) if (this.b風船連打中[i] != true && CharaAction_Balloon_Delay[i].b終了値に達した)
{ {
TJAPlayer3.stage演奏ドラム画面.PuchiChara.On進行描画(TJAPlayer3.Skin.Game_PuchiChara_X[i], TJAPlayer3.Skin.Game_PuchiChara_Y[i], TJAPlayer3.stage演奏ドラム画面.bIsAlreadyMaxed[i]); TJAPlayer3.stage演奏ドラム画面.PuchiChara.On進行描画(TJAPlayer3.Skin.Game_PuchiChara_X[i], TJAPlayer3.Skin.Game_PuchiChara_Y[i], TJAPlayer3.stage演奏ドラム画面.bIsAlreadyMaxed[i], player : i);
} }
} }
return base.On進行描画(); return base.On進行描画();
@ -296,7 +296,7 @@ namespace TJAPlayer3
TJAPlayer3.Tx.Chara_Balloon_Broke[CharaAction_Balloon_Broke[i].n現在の値].Opacity = nowOpacity; TJAPlayer3.Tx.Chara_Balloon_Broke[CharaAction_Balloon_Broke[i].n現在の値].Opacity = nowOpacity;
TJAPlayer3.Tx.Chara_Balloon_Broke[CharaAction_Balloon_Broke[i].n現在の値].t2D描画(TJAPlayer3.app.Device, (TJAPlayer3.Skin.nScrollFieldX[0] - TJAPlayer3.stage演奏ドラム画面.actLaneTaiko.nDefaultJudgePos[0, 0]) + TJAPlayer3.Skin.Game_Chara_Balloon_X[0], TJAPlayer3.Skin.Game_Chara_Balloon_Y[i]); TJAPlayer3.Tx.Chara_Balloon_Broke[CharaAction_Balloon_Broke[i].n現在の値].t2D描画(TJAPlayer3.app.Device, (TJAPlayer3.Skin.nScrollFieldX[0] - TJAPlayer3.stage演奏ドラム画面.actLaneTaiko.nDefaultJudgePos[0, 0]) + TJAPlayer3.Skin.Game_Chara_Balloon_X[0], TJAPlayer3.Skin.Game_Chara_Balloon_Y[i]);
} }
TJAPlayer3.stage演奏ドラム画面.PuchiChara.On進行描画((TJAPlayer3.Skin.nScrollFieldX[0] - TJAPlayer3.stage演奏ドラム画面.actLaneTaiko.nDefaultJudgePos[0, 0]) + TJAPlayer3.Skin.Game_PuchiChara_BalloonX[0], TJAPlayer3.Skin.Game_PuchiChara_BalloonY[i], false, nowOpacity, true); TJAPlayer3.stage演奏ドラム画面.PuchiChara.On進行描画((TJAPlayer3.Skin.nScrollFieldX[0] - TJAPlayer3.stage演奏ドラム画面.actLaneTaiko.nDefaultJudgePos[0, 0]) + TJAPlayer3.Skin.Game_PuchiChara_BalloonX[0], TJAPlayer3.Skin.Game_PuchiChara_BalloonY[i], false, nowOpacity, true, player : i);
if (CharaAction_Balloon_Broke[i].b終了値に達した) if (CharaAction_Balloon_Broke[i].b終了値に達した)
{ {
CharaAction_Balloon_Broke[i].t停止(); CharaAction_Balloon_Broke[i].t停止();
@ -315,7 +315,7 @@ namespace TJAPlayer3
TJAPlayer3.Tx.Chara_Balloon_Miss[CharaAction_Balloon_Miss[i].n現在の値].Opacity = nowOpacity; TJAPlayer3.Tx.Chara_Balloon_Miss[CharaAction_Balloon_Miss[i].n現在の値].Opacity = nowOpacity;
TJAPlayer3.Tx.Chara_Balloon_Miss[CharaAction_Balloon_Miss[i].n現在の値].t2D描画(TJAPlayer3.app.Device, (TJAPlayer3.Skin.nScrollFieldX[0] - TJAPlayer3.stage演奏ドラム画面.actLaneTaiko.nDefaultJudgePos[0, 0]) + TJAPlayer3.Skin.Game_Chara_Balloon_X[0], TJAPlayer3.Skin.Game_Chara_Balloon_Y[i]); TJAPlayer3.Tx.Chara_Balloon_Miss[CharaAction_Balloon_Miss[i].n現在の値].t2D描画(TJAPlayer3.app.Device, (TJAPlayer3.Skin.nScrollFieldX[0] - TJAPlayer3.stage演奏ドラム画面.actLaneTaiko.nDefaultJudgePos[0, 0]) + TJAPlayer3.Skin.Game_Chara_Balloon_X[0], TJAPlayer3.Skin.Game_Chara_Balloon_Y[i]);
} }
TJAPlayer3.stage演奏ドラム画面.PuchiChara.On進行描画((TJAPlayer3.Skin.nScrollFieldX[0] - TJAPlayer3.stage演奏ドラム画面.actLaneTaiko.nDefaultJudgePos[0, 0]) + TJAPlayer3.Skin.Game_PuchiChara_BalloonX[0], TJAPlayer3.Skin.Game_PuchiChara_BalloonY[i], false, nowOpacity, true); TJAPlayer3.stage演奏ドラム画面.PuchiChara.On進行描画((TJAPlayer3.Skin.nScrollFieldX[0] - TJAPlayer3.stage演奏ドラム画面.actLaneTaiko.nDefaultJudgePos[0, 0]) + TJAPlayer3.Skin.Game_PuchiChara_BalloonX[0], TJAPlayer3.Skin.Game_PuchiChara_BalloonY[i], false, nowOpacity, true, player : i);
if (CharaAction_Balloon_Miss[i].b終了値に達した) if (CharaAction_Balloon_Miss[i].b終了値に達した)
{ {
CharaAction_Balloon_Miss[i].t停止(); CharaAction_Balloon_Miss[i].t停止();
@ -326,7 +326,7 @@ namespace TJAPlayer3
else if (CharaAction_Balloon_Breaking[i]?.b進行中 == true && TJAPlayer3.Skin.Game_Chara_Ptn_Balloon_Breaking != 0) else if (CharaAction_Balloon_Breaking[i]?.b進行中 == true && TJAPlayer3.Skin.Game_Chara_Ptn_Balloon_Breaking != 0)
{ {
TJAPlayer3.Tx.Chara_Balloon_Breaking[CharaAction_Balloon_Breaking[i].n現在の値]?.t2D描画(TJAPlayer3.app.Device, (TJAPlayer3.Skin.nScrollFieldX[0] - TJAPlayer3.stage演奏ドラム画面.actLaneTaiko.nDefaultJudgePos[0, 0]) + TJAPlayer3.Skin.Game_Chara_Balloon_X[0], TJAPlayer3.Skin.Game_Chara_Balloon_Y[i]); TJAPlayer3.Tx.Chara_Balloon_Breaking[CharaAction_Balloon_Breaking[i].n現在の値]?.t2D描画(TJAPlayer3.app.Device, (TJAPlayer3.Skin.nScrollFieldX[0] - TJAPlayer3.stage演奏ドラム画面.actLaneTaiko.nDefaultJudgePos[0, 0]) + TJAPlayer3.Skin.Game_Chara_Balloon_X[0], TJAPlayer3.Skin.Game_Chara_Balloon_Y[i]);
TJAPlayer3.stage演奏ドラム画面.PuchiChara.On進行描画((TJAPlayer3.Skin.nScrollFieldX[0] - TJAPlayer3.stage演奏ドラム画面.actLaneTaiko.nDefaultJudgePos[0, 0]) + TJAPlayer3.Skin.Game_PuchiChara_BalloonX[0], TJAPlayer3.Skin.Game_PuchiChara_BalloonY[i], false, 255, true); TJAPlayer3.stage演奏ドラム画面.PuchiChara.On進行描画((TJAPlayer3.Skin.nScrollFieldX[0] - TJAPlayer3.stage演奏ドラム画面.actLaneTaiko.nDefaultJudgePos[0, 0]) + TJAPlayer3.Skin.Game_PuchiChara_BalloonX[0], TJAPlayer3.Skin.Game_PuchiChara_BalloonY[i], false, 255, true, player : i);
} }
//if (CDTXMania.stage演奏ドラム画面.actChara.CharaAction_Balloon_Breaking?.b終了値に達した == true) //if (CDTXMania.stage演奏ドラム画面.actChara.CharaAction_Balloon_Breaking?.b終了値に達した == true)

9
TJAPlayer3/Stages/07.Game/Taiko/PuchiChara.cs
View File

@ -50,7 +50,7 @@ namespace TJAPlayer3
/// <param name="y">Y座標(中央)</param> /// <param name="y">Y座標(中央)</param>
/// <param name="alpha">不透明度</param> /// <param name="alpha">不透明度</param>
/// <returns></returns> /// <returns></returns>
public int On進行描画(int x, int y, bool isGrowing, int alpha = 255, bool isBalloon = false) public int On進行描画(int x, int y, bool isGrowing, int alpha = 255, bool isBalloon = false, int player = 0)
{ {
if (!TJAPlayer3.ConfigIni.ShowPuchiChara) return base.On進行描画(); if (!TJAPlayer3.ConfigIni.ShowPuchiChara) return base.On進行描画();
if (Counter == null || SineCounter == null || TJAPlayer3.Tx.PuchiChara == null) return base.On進行描画(); if (Counter == null || SineCounter == null || TJAPlayer3.Tx.PuchiChara == null) return base.On進行描画();
@ -87,7 +87,12 @@ namespace TJAPlayer3
** - Yellow light color filter when isGrowing is true ** - Yellow light color filter when isGrowing is true
*/ */
int puriChar = 11; int puriChar = TJAPlayer3.NamePlateConfig.data.PuchiChara[player];
if (puriChar < 0)
puriChar = 0;
else if (puriChar >= 120)
puriChar = 119;
int puriColumn = puriChar % 5; int puriColumn = puriChar % 5;
int puriRow = puriChar / 5; int puriRow = puriChar / 5;