Taiko_Stuff/OpenTaiko
1
0
Fork 0
mirror of synced 2025-02-17 19:09:25 +01:00
Code Releases Activity

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

Browse Source
This commit is contained in:
0auBSQ 2023-10-09 14:54:26 +09:00
commit 0f1fe351c7
36 changed files with 704 additions and 214 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
OpenTaiko/Global/Characters/NewTemplate/CharaConfig.txt
View File

@ -92,4 +92,6 @@ Chara_Result_Clear_AnimationDuration=1000
Chara_Result_Failed_In_AnimationDuration=1000
;結果画面のクリア失敗のアニメーションにかける時間 (ms)
Chara_Result_Failed_AnimationDuration=1000
Chara_Result_Failed_AnimationDuration=1000
Result_UseResult1P=1

44
OpenTaiko/Global/Characters/NewTemplate/Metadata.json
View File

@ -2,4 +2,48 @@
"name" : "New Template",
"rarity": "Common",
"author": "[Author]",
"speechtext":[
{
"strings":{
"default":"simplestyleSweat",
"fr":"simplestyleSweat",
"ja":"simplestyleSweat"
}
},
{
"strings":{
"default":"...",
"fr":"...",
"ja":"..."
}
},
{
"strings":{
"default":"○",
"fr":"○",
"ja":"○"
}
},
{
"strings":{
"default":"◎",
"fr":"◎",
"ja":"◎"
}
},
{
"strings":{
"default":"★",
"fr":"★",
"ja":"★"
}
},
{
"strings":{
"default":"!!!!",
"fr":"!!!!",
"ja":"!!!!"
}
}
]
}

BIN
OpenTaiko/Global/Characters/NewTemplate/Result_Clear_1P.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 370 KiB

BIN
OpenTaiko/Global/Characters/NewTemplate/Result_Failed_1P.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 173 KiB

6
OpenTaiko/System/SimpleStyle (1080p)/GameConfig.ini
View File

@ -55,11 +55,11 @@ Game_Judge_Meter_GoodRate=309,798
Game_Judge_Meter_MissRate=309,855
Game_MusicName_X=1740
Game_MusicName_X=1890
Game_MusicName_Y=36
Game_MusicName_MaxWidth=293
Game_MusicName_MaxWidth=990
Game_MusicName_FontSize=41
@ -145,7 +145,7 @@ Game_Taiko_ModIcons_Y=354,639
Game_Taiko_NamePlate_X=0,0
Game_Taiko_NamePlate_Y=450,570
Game_Taiko_NamePlate_Y=450,556
Game_Taiko_X=308,308

2
OpenTaiko/System/SimpleStyle (1080p)/Graphics/5_Game/9_End/ClearFailed/Script.lua
View File

@ -14,7 +14,7 @@ local nowFrame = { 0, 0, 0, 0, 0 }
local textureCount = 25
local useExtraAnime = true
local useExtraAnime = false
function clearIn(player)
end

2
OpenTaiko/System/SimpleStyle (1080p)/Graphics/5_Game/9_End/Dan_Fail/Script.lua
View File

@ -14,7 +14,7 @@ local nowFrame = { 0, 0, 0, 0, 0 }
local textureCount = 25
local useExtraAnime = true
local useExtraAnime = false
function clearIn(player)
end

4
OpenTaiko/System/SimpleStyle (1080p)/SongLoadingConfig.ini
View File

@ -11,11 +11,15 @@ SongLoading_Title_X=960
SongLoading_Title_Y=420
SongLoading_Title_MaxSize=1065
SongLoading_SubTitle_X=960
SongLoading_SubTitle_Y=488
SongLoading_SubTitle_MaxSize=1065
SongLoading_Plate_X_AI=960

8
OpenTaiko/System/SimpleStyle (1080p)/SongSelectConfig.ini
View File

@ -58,6 +58,12 @@ SongSelect_Subtitle_Scale=20
SongSelect_BoxText_Scale=21
SongSelect_Title_MaxSize=825
SongSelect_SubTitle_MaxSize=765
SongSelect_VerticalText=0
SongSelect_Bar_Center_Move=93
@ -303,7 +309,7 @@ SongSelect_Option_Select_Offset=0,-429
SongSelect_Option_Font_Scale=20
SongSelect_Option_OptionType_X=24,1664
SongSelect_Option_OptionType_X=24,1506
SongSelect_Option_OptionType_Y=140,140

6
OpenTaiko/System/SimpleStyle/GameConfig.ini
View File

@ -55,11 +55,11 @@ Game_Judge_Meter_GoodRate=206,532
Game_Judge_Meter_MissRate=206,570
Game_MusicName_X=1160
Game_MusicName_X=1260
Game_MusicName_Y=24
Game_MusicName_MaxWidth=195
Game_MusicName_MaxWidth=660
Game_MusicName_FontSize=27
@ -251,7 +251,7 @@ Game_Balloon_Combo_Number_X=257,257
Game_Balloon_Combo_Number_Y=54,603
Game_Balloon_Combo_Number_Ex_X=297,297
Game_Balloon_Combo_Number_Ex_X=257,257
Game_Balloon_Combo_Number_Ex_Y=54,603

2
OpenTaiko/System/SimpleStyle/Graphics/5_Game/9_End/ClearFailed/Script.lua
View File

@ -18,7 +18,7 @@ local nowFrame = { 0, 0, 0, 0, 0 }
local textureCount = 25
local useExtraAnime = true
local useExtraAnime = false
function clearIn(player)
end

2
OpenTaiko/System/SimpleStyle/Graphics/5_Game/9_End/Dan_Fail/Script.lua
View File

@ -18,7 +18,7 @@ local nowFrame = { 0, 0, 0, 0, 0 }
local textureCount = 25
local useExtraAnime = true
local useExtraAnime = false
function clearIn(player)
end

1
OpenTaiko/System/SimpleStyle/ResultConfig.ini
View File

@ -181,3 +181,4 @@ Result_MusicName_Y=30
Result_MusicName_FontSize=25
Result_MusicName_MaxSize=660

4
OpenTaiko/System/SimpleStyle/SongLoadingConfig.ini
View File

@ -11,11 +11,15 @@ SongLoading_Title_X=640
SongLoading_Title_Y=280
SongLoading_Title_MaxSize=710
SongLoading_SubTitle_X=640
SongLoading_SubTitle_Y=325
SongLoading_SubTitle_MaxSize=710
SongLoading_Plate_X_AI=640

2
OpenTaiko/System/SimpleStyle/SongSelectConfig.ini
View File

@ -310,7 +310,7 @@ SongSelect_Option_Select_Offset=0,-286
SongSelect_Option_Font_Scale=13
SongSelect_Option_OptionType_X=16,1096
SongSelect_Option_OptionType_X=16,1004
SongSelect_Option_OptionType_Y=93,93

5
OpenTaiko/src/Common/CConfigIni.cs
View File

@ -1228,9 +1228,6 @@ namespace TJAPlayer3
public bool ShowMob;
public bool ShowPuchiChara; // リザーブ
public EScrollMode eScrollMode = EScrollMode.Normal;
public bool bスクロールモードを上書き = false;
public bool bHispeedRandom;
public Eステルスモード[] eSTEALTH;
public bool bNoInfo;
@ -3395,10 +3392,12 @@ namespace TJAPlayer3
{
this.eDark = (Eダークモード)CConversion.n値を文字列から取得して範囲内に丸めて返す(str4, 0, 2, (int)this.eDark);
}
/*
else if (str3.Equals("ScrollMode"))
{
this.eScrollMode = (EScrollMode)CConversion.n値を文字列から取得して範囲内に丸めて返す(str4, 0, 2, 0);
}
*/
else if (str3.Equals("EnableCountDownTimer"))
{
this.bEnableCountdownTimer = CConversion.bONorOFF(str4[0]);

114
OpenTaiko/src/Common/CSkin.cs
View File

@ -3538,6 +3538,10 @@ namespace TJAPlayer3
{
SongLoading_Title_Y = int.Parse(strParam);
}
else if (strCommand == nameof(SongLoading_Title_MaxSize))
{
SongLoading_Title_MaxSize = int.Parse(strParam);
}
else if (strCommand == nameof(SongLoading_SubTitle_X))
{
SongLoading_SubTitle_X = int.Parse(strParam);
@ -3546,6 +3550,10 @@ namespace TJAPlayer3
{
SongLoading_SubTitle_Y = int.Parse(strParam);
}
else if (strCommand == nameof(SongLoading_SubTitle_MaxSize))
{
SongLoading_SubTitle_MaxSize = int.Parse(strParam);
}
else if (strCommand == nameof(SongLoading_Plate_X_AI))
{
SongLoading_Plate_X_AI = int.Parse(strParam);
@ -6065,6 +6073,10 @@ namespace TJAPlayer3
#endregion
#region Result
else if (strCommand == "Result_Use1PUI")
{
Result_Use1PUI = CConversion.bONorOFF(strParam[0]);
}
else if (strCommand == nameof(Result_Cloud_Count))
{
Result_Cloud_Count = int.Parse(strParam);
@ -6261,6 +6273,10 @@ namespace TJAPlayer3
Result_Gauge_Rainbow_Y[i] = int.Parse(strSplit[i]);
}
}
else if (strCommand == "Result_Gauge_Rainbow_Interval")
{
Result_Gauge_Rainbow_Interval = int.Parse(strParam);
}
else if (strCommand == "Result_Gauge_ClearText_X")
{
string[] strSplit = strParam.Split(',');
@ -6525,6 +6541,38 @@ namespace TJAPlayer3
Result_Speech_Bubble_Y[i] = int.Parse(strSplit[i]);
}
}
else if (strCommand == "Result_Speech_Bubble_V2_X")
{
string[] strSplit = strParam.Split(',');
for (int i = 0; i < 2; i++)
{
Result_Speech_Bubble_V2_X[i] = int.Parse(strSplit[i]);
}
}
else if (strCommand == "Result_Speech_Bubble_V2_Y")
{
string[] strSplit = strParam.Split(',');
for (int i = 0; i < 2; i++)
{
Result_Speech_Bubble_V2_Y[i] = int.Parse(strSplit[i]);
}
}
else if (strCommand == "Result_Speech_Bubble_V2_2P_X")
{
string[] strSplit = strParam.Split(',');
for (int i = 0; i < 2; i++)
{
Result_Speech_Bubble_V2_2P_X[i] = int.Parse(strSplit[i]);
}
}
else if (strCommand == "Result_Speech_Bubble_V2_2P_Y")
{
string[] strSplit = strParam.Split(',');
for (int i = 0; i < 2; i++)
{
Result_Speech_Bubble_V2_2P_Y[i] = int.Parse(strSplit[i]);
}
}
else if (strCommand == nameof(Result_MusicName_X))
{
Result_MusicName_X = int.Parse(strParam);
@ -6538,6 +6586,10 @@ namespace TJAPlayer3
if (int.Parse(strParam) > 0)
Result_MusicName_FontSize = int.Parse(strParam);
}
else if (strCommand == nameof(Result_MusicName_MaxSize))
{
Result_MusicName_MaxSize = int.Parse(strParam);
}
else if (strCommand == nameof(Result_MusicName_ReferencePoint))
{
Result_MusicName_ReferencePoint = (ReferencePoint)int.Parse(strParam);
@ -7058,6 +7110,38 @@ namespace TJAPlayer3
Result_CrownEffect_5P[i] = int.Parse(strSplit[i]);
}
}
else if (strCommand == "Result_Speech_Bubble_V2_4P")
{
string[] strSplit = strParam.Split(',');
for (int i = 0; i < 2; i++)
{
Result_Speech_Bubble_V2_4P[i] = int.Parse(strSplit[i]);
}
}
else if (strCommand == "Result_Speech_Bubble_V2_5P")
{
string[] strSplit = strParam.Split(',');
for (int i = 0; i < 2; i++)
{
Result_Speech_Bubble_V2_5P[i] = int.Parse(strSplit[i]);
}
}
else if (strCommand == "Result_Speech_Text_Offset")
{
string[] strSplit = strParam.Split(',');
for (int i = 0; i < 2; i++)
{
Result_Speech_Text_Offset[i] = int.Parse(strSplit[i]);
}
}
else if (strCommand == "Result_Speech_Text_Size")
{
Result_Speech_Text_Size = int.Parse(strParam);
}
else if (strCommand == "Result_Speech_Text_MaxWidth")
{
Result_Speech_Text_MaxWidth = int.Parse(strParam);
}
else if (strCommand == "Result_NamePlate_4P")
{
string[] strSplit = strParam.Split(',');
@ -8346,6 +8430,7 @@ namespace TJAPlayer3
public int[][] Characters_Resolution;
public int[][] Characters_Heya_Render_Offset;
public bool[] Characters_UseResult1P;
public int[][] Characters_X;
public int[][] Characters_Y;
public int[][] Characters_4P;
@ -8875,8 +8960,10 @@ namespace TJAPlayer3
public int SongLoading_Plate_Y = 360;
public int SongLoading_Title_X = 640;
public int SongLoading_Title_Y = 280;
public int SongLoading_Title_MaxSize = 710;
public int SongLoading_SubTitle_X = 640;
public int SongLoading_SubTitle_Y = 325;
public int SongLoading_SubTitle_MaxSize = 710;
public int SongLoading_Plate_X_AI = 640;
public int SongLoading_Plate_Y_AI = 360;
@ -9028,10 +9115,10 @@ namespace TJAPlayer3
public int[] Game_CourseSymbol_Back_Rect_5P = new int[] { 0, 140, 384, 105 };
#endregion
#region PanelFont
public int Game_MusicName_X = 1160;
public int Game_MusicName_X = 1260;
public int Game_MusicName_Y = 24;
public int Game_MusicName_FontSize = 27;
public int Game_MusicName_MaxWidth = 195;
public int Game_MusicName_MaxWidth = 660;
public ReferencePoint Game_MusicName_ReferencePoint = ReferencePoint.Center;
public int Game_Genre_X = 1015;
public int Game_Genre_Y = 70;
@ -9181,7 +9268,7 @@ namespace TJAPlayer3
public int[] Game_Balloon_Combo_Y = new int[] { -11, 538 };
public int[] Game_Balloon_Combo_Number_X = new int[] { 257, 257 };
public int[] Game_Balloon_Combo_Number_Y = new int[] { 54, 603 };
public int[] Game_Balloon_Combo_Number_Ex_X = new int[] { 297, 297 };
public int[] Game_Balloon_Combo_Number_Ex_X = new int[] { 257, 257 };
public int[] Game_Balloon_Combo_Number_Ex_Y = new int[] { 54, 603 };
public int[] Game_Balloon_Combo_Number_Size = new int[] { 53, 62 };
public int[] Game_Balloon_Combo_Number_Interval = new int[] { 45, 0 };
@ -9428,6 +9515,8 @@ namespace TJAPlayer3
public int[] Result_UIMove_4P = new int[] { 320, 0 };
public int[] Result_UIMove_5P = new int[] { 256, 0 };
*/
public bool Result_Use1PUI = false;
public int[] Result_UIMove_4P_X = new int[] { 0, 320, 640, 960 };
public int[] Result_UIMove_4P_Y = new int[] { 0, 0, 0, 0 };
public int[] Result_UIMove_5P_X = new int[] { 0, 256, 512, 768, 1024 };
@ -9471,6 +9560,8 @@ namespace TJAPlayer3
public int[] Result_Gauge_Rainbow_X = new int[] { 57, 692 };
public int[] Result_Gauge_Rainbow_Y = new int[] { 144, 144 };
public int Result_Gauge_Rainbow_Ptn;
public int Result_Gauge_Rainbow_Interval = 1000 / 60;
public int[] Result_Gauge_ClearText_X = new int[] { 441, 1076 };
public int[] Result_Gauge_ClearText_Y = new int[] { 142, 142 };
@ -9521,6 +9612,12 @@ namespace TJAPlayer3
public int[] Result_Speech_Bubble_X = new int[] { 430, 850 };
public int[] Result_Speech_Bubble_Y = new int[] { 526, 526 };
public int[] Result_Speech_Bubble_V2_X = new int[] { 0, 0 };
public int[] Result_Speech_Bubble_V2_Y = new int[] { 0, 0 };
public int[] Result_Speech_Bubble_V2_2P_X = new int[] { 0, 0 };
public int[] Result_Speech_Bubble_V2_2P_Y = new int[] { 0, 0 };
public int[] Result_NamePlate_X = new int[] { 28, 1032 };
public int[] Result_NamePlate_Y = new int[] { 621, 621 };
@ -9552,6 +9649,7 @@ namespace TJAPlayer3
public int Result_MusicName_X = 640;
public int Result_MusicName_Y = 30;
public int Result_MusicName_FontSize = 25;
public int Result_MusicName_MaxSize = 660;
public ReferencePoint Result_MusicName_ReferencePoint = ReferencePoint.Center;
public int Result_StageText_X = 230;
public int Result_StageText_Y = 6;
@ -9621,6 +9719,16 @@ namespace TJAPlayer3
public int[] Result_CrownEffect_4P = new int[] { 220, 545 };
public int[] Result_CrownEffect_5P = new int[] { 188, 545 };
public int[] Result_Speech_Bubble_V2_4P = new int[] { 0, 0 };
public int[] Result_Speech_Bubble_V2_5P = new int[] { 0, 0 };
public int[] Result_Speech_Text_Offset = new int[] { 0, 0 };
public int Result_Speech_Text_Size = 60;
public int Result_Speech_Text_MaxWidth = 560;
public int[] Result_NamePlate_4P = new int[] { 80, 621 };
public int[] Result_NamePlate_5P = new int[] { 31, 621 };

15
OpenTaiko/src/Databases/DBCharacter.cs
View File

@ -1,7 +1,7 @@
using System.Collections.Generic;
using System.IO;
using Newtonsoft.Json;
using System.Collections.Generic;
using System.IO;
using Newtonsoft.Json;
namespace TJAPlayer3
{
class DBCharacter
@ -43,13 +43,15 @@ namespace TJAPlayer3
Name = "(None)";
Rarity = "Common";
Author = "(None)";
SpeechText = new CLocalizationData[6] { new CLocalizationData(), new CLocalizationData(), new CLocalizationData(), new CLocalizationData(), new CLocalizationData(), new CLocalizationData() };
}
public CharacterData(string pcn, string pcr, string pca)
public CharacterData(string pcn, string pcr, string pca, CLocalizationData[] pcst)
{
Name = pcn;
Rarity = pcr;
Author = pca;
SpeechText = pcst;
}
@ -61,6 +63,9 @@ namespace TJAPlayer3
[JsonProperty("author")]
public string Author;
[JsonProperty("speechtext")]
public CLocalizationData[] SpeechText;
}
}

12
OpenTaiko/src/Helpers/HGaugeMethods.cs
View File

@ -670,7 +670,7 @@ namespace TJAPlayer3
tDrawCompleteGauge(baseTexture, baseNormaTexture, flashTexture, fillTexture, yellowTexture, rainbowTextureArr, killzoneTexture, clearIcon, soulLetter, soulFlame, gauge_x, gauge_y, gauge_x, gauge_y, opacity, rainbowTextureIndex, soulFlameIndex, difficulty, level, currentPercent, gaugeType, scale, scale, text_x, text_y, perfectHits, totalHits, soul_x, soul_y, fire_x, fire_y, clearRect, clearRectHighlight);
}
public static void UNSAFE_DrawResultGaugeFast(int player, int shiftPos, int pos, int segmentsDisplayed, int rainbowTextureIndex, int soulFlameIndex)
public static void UNSAFE_DrawResultGaugeFast(int player, int shiftPos, int pos, int segmentsDisplayed, int rainbowTextureIndex, int soulFlameIndex, int uioffset_x)
{
var chara = TJAPlayer3.Tx.Characters[TJAPlayer3.SaveFileInstances[TJAPlayer3.GetActualPlayer(player)].data.Character];
CDTX[] dtxs =
@ -721,7 +721,7 @@ namespace TJAPlayer3
}
else
{
gauge_x = TJAPlayer3.Skin.Result_Gauge_X[pos];
gauge_x = TJAPlayer3.Skin.Result_Gauge_X[pos] + uioffset_x;
gauge_y = TJAPlayer3.Skin.Result_Gauge_Y[pos];
}
@ -739,7 +739,7 @@ namespace TJAPlayer3
}
else
{
gauge_rainbow_x = TJAPlayer3.Skin.Result_Gauge_Rainbow_X[pos];
gauge_rainbow_x = TJAPlayer3.Skin.Result_Gauge_Rainbow_X[pos] + uioffset_x;
gauge_rainbow_y = TJAPlayer3.Skin.Result_Gauge_Rainbow_Y[pos];
}
@ -764,9 +764,9 @@ namespace TJAPlayer3
}
else
{
soulText_x = TJAPlayer3.Skin.Result_Soul_Text_X[pos];
soulText_x = TJAPlayer3.Skin.Result_Soul_Text_X[pos] + uioffset_x;
soulText_y = TJAPlayer3.Skin.Result_Soul_Text_Y[pos];
soulFire_x = TJAPlayer3.Skin.Result_Soul_Fire_X[pos];
soulFire_x = TJAPlayer3.Skin.Result_Soul_Fire_X[pos] + uioffset_x;
soulFire_y = TJAPlayer3.Skin.Result_Soul_Fire_Y[pos];
}
@ -785,7 +785,7 @@ namespace TJAPlayer3
}
else
{
clearText_x = TJAPlayer3.Skin.Result_Gauge_ClearText_X[pos];
clearText_x = TJAPlayer3.Skin.Result_Gauge_ClearText_X[pos] + uioffset_x;
clearText_y = TJAPlayer3.Skin.Result_Gauge_ClearText_Y[pos];
}

196
OpenTaiko/src/Songs/CBoxDef.cs
View File

@ -31,13 +31,13 @@ namespace TJAPlayer3
public int BoxChara;
public bool IsChangedBoxChara;
public string DefaultPreimage;
public string ScenePreset;
private readonly string langTITLE = "#TITLE" + CLangManager.fetchLang().ToUpper();
private readonly string langBOXEXPLANATION = "#BOXEXPLANATION" + CLangManager.fetchLang().ToUpper();
// コンストラクタ
public string ScenePreset;
private readonly string langTITLE = "#TITLE" + CLangManager.fetchLang().ToUpper();
private readonly string langBOXEXPLANATION = "#BOXEXPLANATION" + CLangManager.fetchLang().ToUpper();
// コンストラクタ
public CBoxDef()
{
for (int i = 0; i < 3; i++)
@ -52,7 +52,7 @@ namespace TJAPlayer3
BoxChara = 0;
BgColor = Color.White;
DefaultPreimage = null;
ScenePreset = null;
ScenePreset = "";
}
public CBoxDef( string boxdefファイル名 )
: this()
@ -82,90 +82,90 @@ namespace TJAPlayer3
str = str.Substring( 0, str.IndexOf( ';' ) );
}
char[] ignoreChars = new char[] { ':', ' ', '\t' };
var split = str.Split(':');
if (split.Length == 2)
{
string key = split[0];
string value = split[1];
if (key == langTITLE)
{
this.Title = value.Trim(ignoreChars);
}
else if (key == "#TITLE")
{
if (this.Title == "") this.Title = value.Trim(ignoreChars);
}
else if (key == "#GENRE")
{
this.Genre = value.Trim(ignoreChars);
}
else if (key == "#SELECTBG")
{
this.SelectBG = value.Trim(ignoreChars);
}
else if (key == "#FONTCOLOR")
{
this.Color = ColorTranslator.FromHtml(value.Trim(ignoreChars));
}
else if (key == "#FORECOLOR")
{
this.ForeColor = ColorTranslator.FromHtml(value.Trim(ignoreChars));
IsChangedForeColor = true;
}
else if (key == "#BACKCOLOR")
{
this.BackColor = ColorTranslator.FromHtml(value.Trim(ignoreChars));
IsChangedBackColor = true;
}
else if (key == "#BOXCOLOR")
{
this.BoxColor = ColorTranslator.FromHtml(value.Trim(ignoreChars));
IsChangedBoxColor = true;
}
else if (key == "#BGCOLOR")
{
this.BgColor = ColorTranslator.FromHtml(value.Trim(ignoreChars));
IsChangedBgColor = true;
}
else if (key == "#BGTYPE")
{
this.BgType = int.Parse(value.Trim(ignoreChars));
IsChangedBgType = true;
}
else if (key == "#BOXTYPE")
{
this.BoxType = int.Parse(value.Trim(ignoreChars));
IsChangedBoxType = true;
}
else if (key == "#BOXCHARA")
{
this.BoxChara = int.Parse(value.Trim(ignoreChars));
IsChangedBoxChara = true;
}
else if (key == "#SCENEPRESET")
{
this.ScenePreset = value.Trim(ignoreChars);
}
else if (key == "#DEFAULTPREIMAGE")
{
this.DefaultPreimage = Path.Combine(Directory.GetParent(boxdefファイル名).FullName, value.Trim(ignoreChars));
}
else
{
for (int i = 0; i < 3; i++)
{
if (key == langBOXEXPLANATION + (i + 1).ToString())
{
this.strBoxText[i] = value.Trim(ignoreChars);
}
else if (key == "#BOXEXPLANATION" + (i + 1).ToString())
{
if (this.strBoxText[i] == "") this.strBoxText[i] = value.Trim(ignoreChars);
}
}
char[] ignoreChars = new char[] { ':', ' ', '\t' };
var split = str.Split(':');
if (split.Length == 2)
{
string key = split[0];
string value = split[1];
if (key == langTITLE)
{
this.Title = value.Trim(ignoreChars);
}
else if (key == "#TITLE")
{
if (this.Title == "") this.Title = value.Trim(ignoreChars);
}
else if (key == "#GENRE")
{
this.Genre = value.Trim(ignoreChars);
}
else if (key == "#SELECTBG")
{
this.SelectBG = value.Trim(ignoreChars);
}
else if (key == "#FONTCOLOR")
{
this.Color = ColorTranslator.FromHtml(value.Trim(ignoreChars));
}
else if (key == "#FORECOLOR")
{
this.ForeColor = ColorTranslator.FromHtml(value.Trim(ignoreChars));
IsChangedForeColor = true;
}
else if (key == "#BACKCOLOR")
{
this.BackColor = ColorTranslator.FromHtml(value.Trim(ignoreChars));
IsChangedBackColor = true;
}
else if (key == "#BOXCOLOR")
{
this.BoxColor = ColorTranslator.FromHtml(value.Trim(ignoreChars));
IsChangedBoxColor = true;
}
else if (key == "#BGCOLOR")
{
this.BgColor = ColorTranslator.FromHtml(value.Trim(ignoreChars));
IsChangedBgColor = true;
}
else if (key == "#BGTYPE")
{
this.BgType = int.Parse(value.Trim(ignoreChars));
IsChangedBgType = true;
}
else if (key == "#BOXTYPE")
{
this.BoxType = int.Parse(value.Trim(ignoreChars));
IsChangedBoxType = true;
}
else if (key == "#BOXCHARA")
{
this.BoxChara = int.Parse(value.Trim(ignoreChars));
IsChangedBoxChara = true;
}
else if (key == "#SCENEPRESET")
{
this.ScenePreset = value.Trim(ignoreChars);
}
else if (key == "#DEFAULTPREIMAGE")
{
this.DefaultPreimage = Path.Combine(Directory.GetParent(boxdefファイル名).FullName, value.Trim(ignoreChars));
}
else
{
for (int i = 0; i < 3; i++)
{
if (key == langBOXEXPLANATION + (i + 1).ToString())
{
this.strBoxText[i] = value.Trim(ignoreChars);
}
else if (key == "#BOXEXPLANATION" + (i + 1).ToString())
{
if (this.strBoxText[i] == "") this.strBoxText[i] = value.Trim(ignoreChars);
}
}
}
}
}
@ -182,13 +182,13 @@ namespace TJAPlayer3
reader.Close();
/*
if (!IsChangedBoxType)
{
this.BoxType = this.nStrジャンルtoNum(this.Genre);
if (!IsChangedBoxType)
{
this.BoxType = this.nStrジャンルtoNum(this.Genre);
}
if (!IsChangedBgType)
{
this.BgType = this.nStrジャンルtoNum(this.Genre);
if (!IsChangedBgType)
{
this.BgType = this.nStrジャンルtoNum(this.Genre);
}
*/
}

82
OpenTaiko/src/Songs/CDTX.cs
View File

@ -171,6 +171,7 @@ namespace TJAPlayer3
public class CChip : IComparable<CDTX.CChip>, ICloneable
{
public EScrollMode eScrollMode;
public bool bHit;
public bool b可視 = true;
public bool bHideBarLine = true;
@ -1118,12 +1119,15 @@ namespace TJAPlayer3
public Dictionary<int, CSCROLL> listSCROLL_Master;
public Dictionary<int, CJPOSSCROLL> listJPOSSCROLL;
public List<DanSongs> List_DanSongs;
private EScrollMode eScrollMode;
private double[] dbNowSCROLL_Normal;
private double[] dbNowSCROLL_Expert;
private double[] dbNowSCROLL_Master;
private int nNextSongOffset;
public Dictionary<int, CDELAY> listDELAY;
public Dictionary<int, CBRANCH> listBRANCH;
@ -3567,7 +3571,7 @@ namespace TJAPlayer3
MinBPM = dbBPM;
}
this.listBPM.Add(this.n内部番号BPM1to - 1, new CBPM() { n内部番号 = this.n内部番号BPM1to - 1, n表記上の番号 = 0, dbBPM値 = dbBPM, bpm_change_time = this.dbNowTime, bpm_change_bmscroll_time = this.dbNowBMScollTime, bpm_change_course = this.n現在のコース });
this.listBPM.Add(this.n内部番号BPM1to - 1, new CBPM() { n内部番号 = this.n内部番号BPM1to - 1, n表記上の番号 = 0, dbBPM値 = dbBPM, bpm_change_time = this.dbNowTime - nNextSongOffset, bpm_change_bmscroll_time = this.dbNowBMScollTime, bpm_change_course = this.n現在のコース });
//チップ追加して割り込んでみる。
@ -6266,7 +6270,8 @@ namespace TJAPlayer3
}
else if (command == "#NEXTSONG")
{
var delayTime = 6200.0; // 6.2秒ディレイ
nNextSongOffset += nOFFSET;
var delayTime = 6200.0 + nOFFSET; // 6.2秒ディレイ
//チップ追加して割り込んでみる。
var chip = new CChip();
@ -6276,7 +6281,7 @@ namespace TJAPlayer3
chip.fNow_Measure_m = this.fNow_Measure_m;
chip.fNow_Measure_s = this.fNow_Measure_s;
this.dbNowTime += delayTime;
this.dbNowBMScollTime += delayTime * this.dbNowBPM / 15000;
this.dbNowBMScollTime += (delayTime - nOFFSET) * this.dbNowBPM / 15000;
chip.n整数値_内部番号 = 0;
chip.nコース = this.n現在のコース;
@ -6345,7 +6350,7 @@ namespace TJAPlayer3
nextSongnextSongChip.nチャンネル番号 = 0x01;
nextSongnextSongChip.n発声位置 = 384;
nextSongnextSongChip.n発声時刻ms = (int)this.dbNowTime;
nextSongnextSongChip.n発声時刻ms = (int)this.dbNowTime - (bOFFSETの値がマイナスである ? -nOFFSET : nOFFSET);
nextSongnextSongChip.fNow_Measure_m = this.fNow_Measure_m;
nextSongnextSongChip.fNow_Measure_s = this.fNow_Measure_s;
nextSongnextSongChip.n整数値 = 0x01;
@ -6359,6 +6364,60 @@ namespace TJAPlayer3
// チップを配置。
this.listChip.Add(nextSongnextSongChip);
}
else if (command == "#NMSCROLL")
{
//チップ追加して割り込んでみる。
var chip = new CChip();
chip.nチャンネル番号 = 0x09;
chip.n発声位置 = ((this.n現在の小節数) * 384) - 1;
chip.n発声時刻ms = (int)this.dbNowTime;
chip.fNow_Measure_m = this.fNow_Measure_m;
chip.fNow_Measure_s = this.fNow_Measure_s;
chip.n整数値_内部番号 = this.n内部番号SCROLL1to;
chip.nコース = this.n現在のコース;
// チップを配置。
eScrollMode = EScrollMode.Normal;
this.listChip.Add(chip);
}
else if (command == "#BMSCROLL")
{
//チップ追加して割り込んでみる。
var chip = new CChip();
chip.nチャンネル番号 = 0x0A;
chip.n発声位置 = ((this.n現在の小節数) * 384) - 1;
chip.n発声時刻ms = (int)this.dbNowTime;
chip.fNow_Measure_m = this.fNow_Measure_m;
chip.fNow_Measure_s = this.fNow_Measure_s;
chip.n整数値_内部番号 = this.n内部番号SCROLL1to;
chip.nコース = this.n現在のコース;
// チップを配置。
eScrollMode = EScrollMode.BMSCROLL;
this.listChip.Add(chip);
}
else if (command == "#HBSCROLL")
{
//チップ追加して割り込んでみる。
var chip = new CChip();
chip.nチャンネル番号 = 0x0B;
chip.n発声位置 = ((this.n現在の小節数) * 384) - 1;
chip.n発声時刻ms = (int)this.dbNowTime;
chip.fNow_Measure_m = this.fNow_Measure_m;
chip.fNow_Measure_s = this.fNow_Measure_s;
chip.n整数値_内部番号 = this.n内部番号SCROLL1to;
chip.nコース = this.n現在のコース;
// チップを配置。
eScrollMode = EScrollMode.HBSCROLL;
this.listChip.Add(chip);
}
}
void t現在のチップ情報を記録する(bool bInPut)
{
@ -6499,6 +6558,7 @@ namespace TJAPlayer3
chip.dbSCROLL = this.dbNowScroll;
chip.dbSCROLL_Y = this.dbNowScrollY;
chip.fBMSCROLLTime = (float)this.dbNowBMScollTime;
chip.eScrollMode = eScrollMode;
if (IsEndedBranching)
chip.nコース = (ECourse)i;
@ -6553,6 +6613,7 @@ namespace TJAPlayer3
hakusen.fNow_Measure_s = this.fNow_Measure_s;
hakusen.dbSCROLL_Y = this.dbNowScrollY;
hakusen.nコース = n現在のコース;
hakusen.eScrollMode = eScrollMode;
this.listChip.Add(hakusen);
//--全ての拍線の時間を出力する--
@ -6626,6 +6687,7 @@ namespace TJAPlayer3
chip.dbSCROLL = this.dbNowScroll;
chip.dbSCROLL_Y = this.dbNowScrollY;
chip.nスクロール方向 = this.nスクロール方向;
chip.eScrollMode = eScrollMode;
if (IsEndedBranching)
chip.nコース = (ECourse)i;
@ -6895,13 +6957,17 @@ namespace TJAPlayer3
{
if (TJAPlayer3.actEnumSongs != null && TJAPlayer3.actEnumSongs.IsDeActivated)
{
if (InputText.Equals("#HBSCROLL") && TJAPlayer3.ConfigIni.bスクロールモードを上書き == false)
if (InputText.Equals("#NMSCROLL"))
{
TJAPlayer3.ConfigIni.eScrollMode = EScrollMode.HBSCROLL;
eScrollMode = EScrollMode.Normal;
}
if (InputText.Equals("#BMSCROLL") && TJAPlayer3.ConfigIni.bスクロールモードを上書き == false)
else if (InputText.Equals("#HBSCROLL"))
{
TJAPlayer3.ConfigIni.eScrollMode = EScrollMode.BMSCROLL;
eScrollMode = EScrollMode.HBSCROLL;
}
if (InputText.Equals("#BMSCROLL"))
{
eScrollMode = EScrollMode.BMSCROLL;
}
}

12
OpenTaiko/src/Stages/01.StartUp/CCharacter.cs
View File

@ -30,20 +30,20 @@ namespace TJAPlayer3
_path = path;
// Character metadata
if (File.Exists($@"{path}\Metadata.json"))
metadata = ConfigManager.GetConfig<DBCharacter.CharacterData>($@"{path}\Metadata.json");
if (File.Exists($@"{path}{Path.DirectorySeparatorChar}Metadata.json"))
metadata = ConfigManager.GetConfig<DBCharacter.CharacterData>($@"{path}{Path.DirectorySeparatorChar}Metadata.json");
else
metadata = new DBCharacter.CharacterData();
// Character metadata
if (File.Exists($@"{path}\Effects.json"))
effect = ConfigManager.GetConfig<DBCharacter.CharacterEffect>($@"{path}\Effects.json");
if (File.Exists($@"{path}{Path.DirectorySeparatorChar}Effects.json"))
effect = ConfigManager.GetConfig<DBCharacter.CharacterEffect>($@"{path}{Path.DirectorySeparatorChar}Effects.json");
else
effect = new DBCharacter.CharacterEffect();
// Character unlockables
if (File.Exists($@"{path}\Unlock.json"))
unlock = ConfigManager.GetConfig<DBUnlockables.CUnlockConditions>($@"{path}\Unlock.json");
if (File.Exists($@"{path}{Path.DirectorySeparatorChar}Unlock.json"))
unlock = ConfigManager.GetConfig<DBUnlockables.CUnlockConditions>($@"{path}{Path.DirectorySeparatorChar}Unlock.json");
else
unlock = null;
}

45
OpenTaiko/src/Stages/01.StartUp/TextureLoader.cs
View File

@ -1084,6 +1084,10 @@ namespace TJAPlayer3
Result_Speech_Bubble[0] = TxC(RESULT + @$"Speech_Bubble.png");
Result_Speech_Bubble[1] = TxC(RESULT + @$"Speech_Bubble_2.png");
Result_Speech_Bubble_V2[0] = TxC(RESULT + @$"Speech_Bubble_V2_Left.png");
Result_Speech_Bubble_V2[1] = TxC(RESULT + @$"Speech_Bubble_V2_Right.png");
Result_Speech_Bubble_V2[2] = TxC(RESULT + @$"Speech_Bubble_V2_4P_5P.png");
Result_Flower = TxC(RESULT + @$"Flower{Path.DirectorySeparatorChar}Flower.png");
for (int i = 0; i < 4; i++)
@ -1098,9 +1102,15 @@ namespace TJAPlayer3
//for (int i = 0; i < 3; i++)
//Result_Work[i] = TxC(RESULT + @$"Work{Path.DirectorySeparatorChar}" + i.ToString() + ".png");
for (int i = 0; i < 41; i++)
Result_Rainbow[i] = TxC(RESULT + @$"Rainbow{Path.DirectorySeparatorChar}" + i.ToString() + ".png");
TJAPlayer3.Skin.Result_Gauge_Rainbow_Ptn = TJAPlayer3.t連番画像の枚数を数える(CSkin.Path(BASE + RESULT + @$"Rainbow{Path.DirectorySeparatorChar}"));
if (TJAPlayer3.Skin.Result_Gauge_Rainbow_Ptn != 0)
{
Result_Rainbow = new CTexture[TJAPlayer3.Skin.Result_Gauge_Rainbow_Ptn];
for (int i = 0; i < TJAPlayer3.Skin.Result_Gauge_Rainbow_Ptn; i++)
{
Result_Rainbow[i] = TxC(RESULT + @$"Rainbow{Path.DirectorySeparatorChar}" + i.ToString() + ".png");
}
}
//for (int i = 0; i < 6; i++)
//Result_Background[i] = TxC(RESULT + @$"Background_" + i.ToString() + ".png");
@ -1177,6 +1187,8 @@ namespace TJAPlayer3
Characters_Heya_Preview = new CTexture[TJAPlayer3.Skin.Characters_Ptn];
Characters_Heya_Render = new CTexture[TJAPlayer3.Skin.Characters_Ptn];
Characters_Result_Clear_1P = new CTexture[TJAPlayer3.Skin.Characters_Ptn];
Characters_Result_Failed_1P = new CTexture[TJAPlayer3.Skin.Characters_Ptn];
Characters = new CCharacter[TJAPlayer3.Skin.Characters_Ptn];
Characters_Normal = new CTexture[TJAPlayer3.Skin.Characters_Ptn][];
@ -1246,6 +1258,7 @@ namespace TJAPlayer3
TJAPlayer3.Skin.Characters_Resolution = new int[TJAPlayer3.Skin.Characters_Ptn][];
TJAPlayer3.Skin.Characters_Heya_Render_Offset = new int[TJAPlayer3.Skin.Characters_Ptn][];
TJAPlayer3.Skin.Characters_UseResult1P = new bool[TJAPlayer3.Skin.Characters_Ptn];
TJAPlayer3.Skin.Characters_X = new int[TJAPlayer3.Skin.Characters_Ptn][];
TJAPlayer3.Skin.Characters_Y = new int[TJAPlayer3.Skin.Characters_Ptn][];
TJAPlayer3.Skin.Characters_4P = new int[TJAPlayer3.Skin.Characters_Ptn][];
@ -1325,9 +1338,13 @@ namespace TJAPlayer3
{
Characters_Heya_Preview[i] = TxCGlobal(CHARACTERS + TJAPlayer3.Skin.Characters_DirName[i] + @$"{Path.DirectorySeparatorChar}Normal{Path.DirectorySeparatorChar}0.png");
Characters_Heya_Render[i] = TxCGlobal(CHARACTERS + TJAPlayer3.Skin.Characters_DirName[i] + @$"{Path.DirectorySeparatorChar}Render.png");
Characters_Result_Clear_1P[i] = TxCGlobal(CHARACTERS + TJAPlayer3.Skin.Characters_DirName[i] + @$"{Path.DirectorySeparatorChar}Result_Clear_1P.png");
Characters_Result_Failed_1P[i] = TxCGlobal(CHARACTERS + TJAPlayer3.Skin.Characters_DirName[i] + @$"{Path.DirectorySeparatorChar}Result_Failed_1P.png");
TJAPlayer3.Skin.Characters_Resolution[i] = new int[] { 1280, 720 };
TJAPlayer3.Skin.Characters_Heya_Render_Offset[i] = new int[] { 0, 0 };
TJAPlayer3.Skin.Characters_UseResult1P[i] = false;
var _str = "";
TJAPlayer3.Skin.LoadSkinConfigFromFile(charaDirs[i] + @$"{Path.DirectorySeparatorChar}CharaConfig.txt", ref _str);
@ -1349,6 +1366,10 @@ namespace TJAPlayer3
TJAPlayer3.Skin.Characters_Heya_Render_Offset[i][0] = int.Parse(values[0]);
TJAPlayer3.Skin.Characters_Heya_Render_Offset[i][1] = int.Parse(values[1]);
}
else if (line.StartsWith("Result_UseResult1P="))
{
TJAPlayer3.Skin.Characters_UseResult1P[i] = FDK.CConversion.bONorOFF(line.Substring(19).Trim()[0]);
}
}
Characters[i] = new CCharacter(charaDirs[i]);
@ -2153,6 +2174,17 @@ namespace TJAPlayer3
TJAPlayer3.Skin.Characters_Result_Failed_AnimationDuration[i] = int.Parse(strParam);
break;
}
/*
case "Chara_Result_SpeechText":
{
string[] strSplit = strParam.Split(',');
for (int j = 0; j < 6; j++)
{
TJAPlayer3.Skin.Characters_Result_SpeechText[i][j] = strSplit[j];
}
break;
}
*/
default: { break; }
}
}
@ -2697,7 +2729,8 @@ namespace TJAPlayer3
Result_Gauge = new CTexture[5],
Result_Gauge_Base = new CTexture[5],
Result_Speech_Bubble = new CTexture[2]
Result_Speech_Bubble = new CTexture[2],
Result_Speech_Bubble_V2 = new CTexture[3]
/*,
Result_Mountain = new CTexture[4]*/;
#endregion
@ -2786,7 +2819,9 @@ Result_Mountain = new CTexture[4]*/;
Characters_Result_Normal;
public CTexture[] Characters_Heya_Preview,
Characters_Heya_Render;
Characters_Heya_Render,
Characters_Result_Clear_1P,
Characters_Result_Failed_1P;
public CCharacter[] Characters;
#endregion

4
OpenTaiko/src/Stages/05.SongSelect/CActSelect曲リスト.cs
View File

@ -1016,7 +1016,7 @@ namespace TJAPlayer3
#region [ Songs not found画像 ]
try
{
this.txSongNotFound = new CTexture(ft曲リスト用フォント.DrawText_V("Songs not found.\nYou need to install songs.", Color.White));
this.txSongNotFound = new CTexture(ft曲リスト用フォント.DrawText("Songs not found.\nYou need to install songs.", Color.White));
this.txSongNotFound.vc拡大縮小倍率 = new Vector3D<float>( 0.5f, 0.5f, 1f ); // 半分のサイズで表示する。
/*
@ -1048,7 +1048,7 @@ namespace TJAPlayer3
#region [ "曲データを検索しています"画像 ]
try
{
this.txEnumeratingSongs = new CTexture(ft曲リスト用フォント.DrawText_V("Now enumerating songs.\nPlease wait...", Color.White));
this.txEnumeratingSongs = new CTexture(ft曲リスト用フォント.DrawText("Now enumerating songs.\nPlease wait...", Color.White));
this.txEnumeratingSongs.vc拡大縮小倍率 = new Vector3D<float>( 0.5f, 0.5f, 1f ); // 半分のサイズで表示する。
/*

8
OpenTaiko/src/Stages/05.SongSelect/CStage選曲.cs
View File

@ -379,8 +379,6 @@ namespace TJAPlayer3
}
finally
{
TJAPlayer3.ConfigIni.eScrollMode = EScrollMode.Normal;
TJAPlayer3.ConfigIni.bスクロールモードを上書き = false;
Trace.TraceInformation("選曲ステージの活性化を完了しました。");
Trace.Unindent();
}
@ -597,10 +595,6 @@ namespace TJAPlayer3
TJAPlayer3.act文字コンソール.tPrint(0, 16, C文字コンソール.Eフォント種別.白, "GAME: SURVIVAL HARD");
if (TJAPlayer3.ConfigIni.bSuperHard)
TJAPlayer3.act文字コンソール.tPrint(0, 32, C文字コンソール.Eフォント種別.赤, "SUPER HARD MODE : ON");
if (TJAPlayer3.ConfigIni.eScrollMode == EScrollMode.BMSCROLL)
TJAPlayer3.act文字コンソール.tPrint(0, 48, C文字コンソール.Eフォント種別.赤, "BMSCROLL : ON");
else if (TJAPlayer3.ConfigIni.eScrollMode == EScrollMode.HBSCROLL)
TJAPlayer3.act文字コンソール.tPrint(0, 48, C文字コンソール.Eフォント種別.赤, "HBSCROLL : ON");
#endregion
@ -944,6 +938,7 @@ namespace TJAPlayer3
#region [ F6 SCROLL ]
if (TJAPlayer3.Input管理.Keyboard.KeyPressed((int)SlimDXKeys.Key.F6))
{
/*
TJAPlayer3.Skin.sound変更音.t再生する();
TJAPlayer3.ConfigIni.bスクロールモードを上書き = true;
switch ((int)TJAPlayer3.ConfigIni.eScrollMode)
@ -959,6 +954,7 @@ namespace TJAPlayer3
TJAPlayer3.ConfigIni.bスクロールモードを上書き = false;
break;
}
*/
}
#endregion
#region [ F7 TokkunMode ]

3
OpenTaiko/src/Stages/06.SongLoading/CStage曲読み込み.cs
View File

@ -127,7 +127,7 @@ namespace TJAPlayer3
{
this.txタイトル = new CTexture( bmpSongTitle );
txタイトル.vc拡大縮小倍率.X = TJAPlayer3.GetSongNameXScaling(ref txタイトル, 710);
txタイトル.vc拡大縮小倍率.X = TJAPlayer3.GetSongNameXScaling(ref txタイトル, TJAPlayer3.Skin.SongLoading_Title_MaxSize);
}
using (var bmpSongSubTitle = this.pfSUBTITLE.DrawText( サブタイトル, TJAPlayer3.Skin.SongLoading_SubTitle_ForeColor, TJAPlayer3.Skin.SongLoading_SubTitle_BackColor, null, 30 ))
@ -135,6 +135,7 @@ namespace TJAPlayer3
{
this.txサブタイトル = new CTexture( bmpSongSubTitle );
txサブタイトル.vc拡大縮小倍率.X = TJAPlayer3.GetSongNameXScaling(ref txサブタイトル, TJAPlayer3.Skin.SongLoading_SubTitle_MaxSize);
}
}
else

27
OpenTaiko/src/Stages/07.Game/CAct演奏パネル文字列.cs
View File

@ -207,13 +207,8 @@ namespace TJAPlayer3
public override void Activate()
{
if( !string.IsNullOrEmpty( TJAPlayer3.ConfigIni.FontName ) )
{
this.pfMusicName = new CCachedFontRenderer( TJAPlayer3.ConfigIni.FontName, TJAPlayer3.Skin.Game_MusicName_FontSize);
//this.pf縦書きテスト = new CPrivateFastFont( new FontFamily( CDTXMania.ConfigIni.strPrivateFontで使うフォント名 ), 22 );
}
this.txPanel = null;
this.pfMusicName = HPrivateFastFont.tInstantiateMainFont(TJAPlayer3.Skin.Game_MusicName_FontSize);
this.txPanel = null;
this.ct進行用 = new CCounter();
this.Start();
this.bFirst = true;
@ -263,16 +258,13 @@ namespace TJAPlayer3
{
if( this.txMusicName != null )
{
float fRate = 660.0f / this.txMusicName.szテクスチャサイズ.Width;
if (this.txMusicName.szテクスチャサイズ.Width <= 660.0f)
float fRate = (float)TJAPlayer3.Skin.Game_MusicName_MaxWidth / this.txMusicName.szテクスチャサイズ.Width;
if (this.txMusicName.szテクスチャサイズ.Width <= TJAPlayer3.Skin.Game_MusicName_MaxWidth)
fRate = 1.0f;
this.txMusicName.vc拡大縮小倍率.X = fRate;
if (this.txMusicName.szテクスチャサイズ.Width >= TJAPlayer3.Skin.Game_MusicName_MaxWidth)
this.txMusicName.t2D描画(TJAPlayer3.Skin.Game_MusicName_X - ((this.txMusicName.szテクスチャサイズ.Width * fRate) / 2) - (this.txMusicName.szテクスチャサイズ.Width / 2), TJAPlayer3.Skin.Game_MusicName_Y);
else
this.txMusicName.t2D描画(TJAPlayer3.Skin.Game_MusicName_X - ((this.txMusicName.szテクスチャサイズ.Width * fRate) / 2), TJAPlayer3.Skin.Game_MusicName_Y);
this.txMusicName.t2D描画(TJAPlayer3.Skin.Game_MusicName_X - (this.txMusicName.szテクスチャサイズ.Width * fRate), TJAPlayer3.Skin.Game_MusicName_Y);
}
}
else
@ -309,16 +301,13 @@ namespace TJAPlayer3
}
if (this.txMusicName != null)
{
float fRate = 660.0f / this.txMusicName.szテクスチャサイズ.Width;
if (this.txMusicName.szテクスチャサイズ.Width <= 660.0f)
float fRate = (float)TJAPlayer3.Skin.Game_MusicName_MaxWidth / this.txMusicName.szテクスチャサイズ.Width;
if (this.txMusicName.szテクスチャサイズ.Width <= TJAPlayer3.Skin.Game_MusicName_MaxWidth)
fRate = 1.0f;
this.txMusicName.vc拡大縮小倍率.X = fRate;
if (this.txMusicName.szテクスチャサイズ.Width >= TJAPlayer3.Skin.Game_MusicName_MaxWidth)
this.txMusicName.t2D描画(TJAPlayer3.Skin.Game_MusicName_X - ((this.txMusicName.szテクスチャサイズ.Width * fRate) / 2) - ((this.txMusicName.szテクスチャサイズ.Width - TJAPlayer3.Skin.Game_MusicName_MaxWidth) / 2), TJAPlayer3.Skin.Game_MusicName_Y);
else
this.txMusicName.t2D描画(TJAPlayer3.Skin.Game_MusicName_X - ((this.txMusicName.szテクスチャサイズ.Width * fRate) / 2), TJAPlayer3.Skin.Game_MusicName_Y);
this.txMusicName.t2D描画(TJAPlayer3.Skin.Game_MusicName_X - (this.txMusicName.szテクスチャサイズ.Width * fRate), TJAPlayer3.Skin.Game_MusicName_Y);
}
}
}

4
OpenTaiko/src/Stages/07.Game/CAct演奏演奏情報.cs
View File

@ -43,7 +43,6 @@ namespace TJAPlayer3
NotesTextM = string.Format( "NoteM: {0:####0}", TJAPlayer3.DTX.nノーツ数_Branch[2]);
NotesTextC = string.Format( "NoteC: {0:####0}", TJAPlayer3.DTX.nノーツ数[3] );
ScoreModeText = string.Format( "SCOREMODE: {0:####0}", TJAPlayer3.DTX.nScoreModeTmp );
ScrollModeText = string.Format( "SCROLLMODE: {0:####0}", Enum.GetName(typeof(EScrollMode), TJAPlayer3.ConfigIni.eScrollMode ) );
ListChipText = string.Format( "ListChip: {0:####0}", _chipCounts[0]);
ListChipMText = string.Format( "ListChipM: {0:####0}", _chipCounts[1]);
@ -82,8 +81,6 @@ namespace TJAPlayer3
y -= 0x10;
TJAPlayer3.act文字コンソール.tPrint( x, y, C文字コンソール.Eフォント種別.白, ScoreModeText );
y -= 0x10;
TJAPlayer3.act文字コンソール.tPrint( x, y, C文字コンソール.Eフォント種別.白, ScrollModeText );
y -= 0x10;
TJAPlayer3.act文字コンソール.tPrint(x, y, C文字コンソール.Eフォント種別.白, ListChipText);
y -= 0x10;
TJAPlayer3.act文字コンソール.tPrint(x, y, C文字コンソール.Eフォント種別.白, ListChipMText);
@ -102,7 +99,6 @@ namespace TJAPlayer3
private string NotesTextM;
private string NotesTextC;
private string ScoreModeText;
private string ScrollModeText;
private string ListChipText;
private string ListChipMText;
}

31
OpenTaiko/src/Stages/07.Game/CStage演奏画面共通.cs
View File

@ -1762,7 +1762,7 @@ namespace TJAPlayer3
else
this.nHand[nPlayer] = 0;
if (TJAPlayer3.stage演奏ドラム画面.actPlayInfo.dbBPM[nPlayer] < 0 && (TJAPlayer3.ConfigIni.eScrollMode == EScrollMode.HBSCROLL))
if (TJAPlayer3.stage演奏ドラム画面.actPlayInfo.dbBPM[nPlayer] < 0 && (pChip.eScrollMode == EScrollMode.HBSCROLL))
pChip.fBMSCROLLTime -= TJAPlayer3.stage演奏ドラム画面.actPlayInfo.dbBPM[nPlayer] * -0.05;
TJAPlayer3.stage演奏ドラム画面.actTaikoLaneFlash.PlayerLane[nPlayer].Start(PlayerLane.FlashType.Red);
@ -3450,15 +3450,15 @@ namespace TJAPlayer3
double _scrollSpeed = pChip.dbSCROLL * (db現在の譜面スクロール速度[nPlayer] + 1.0) / 10.0;
double _scrollSpeed_Y = pChip.dbSCROLL_Y * (db現在の譜面スクロール速度[nPlayer] + 1.0) / 10.0;
pChip.nバーからの距離dot.Taiko = NotesManager.GetNoteX(pChip, time * pChip.dbBPM, _scrollSpeed, TJAPlayer3.Skin.Game_Notes_Interval, play_bpm_time, configIni.eScrollMode, false);
pChip.nバーからの距離dot.Taiko = NotesManager.GetNoteX(pChip, time * pChip.dbBPM, _scrollSpeed, TJAPlayer3.Skin.Game_Notes_Interval, play_bpm_time, pChip.eScrollMode, false);
if ( pChip.nノーツ終了時刻ms != 0 )
{
pChip.nバーからのノーツ末端距離dot = NotesManager.GetNoteX(pChip, (pChip.nノーツ終了時刻ms - n現在時刻ms) * pChip.dbBPM, _scrollSpeed, TJAPlayer3.Skin.Game_Notes_Interval, play_bpm_time, configIni.eScrollMode, true);
pChip.nバーからのノーツ末端距離dot_Y = NotesManager.GetNoteY(pChip, (pChip.nノーツ終了時刻ms - n現在時刻ms) * pChip.dbBPM, _scrollSpeed_Y, TJAPlayer3.Skin.Game_Notes_Interval, play_bpm_time, configIni.eScrollMode, true);
pChip.nバーからのノーツ末端距離dot = NotesManager.GetNoteX(pChip, (pChip.nノーツ終了時刻ms - n現在時刻ms) * pChip.dbBPM, _scrollSpeed, TJAPlayer3.Skin.Game_Notes_Interval, play_bpm_time, pChip.eScrollMode, true);
pChip.nバーからのノーツ末端距離dot_Y = NotesManager.GetNoteY(pChip, (pChip.nノーツ終了時刻ms - n現在時刻ms) * pChip.dbBPM, _scrollSpeed_Y, TJAPlayer3.Skin.Game_Notes_Interval, play_bpm_time, pChip.eScrollMode, true);
}
if ( configIni.eScrollMode == EScrollMode.BMSCROLL || configIni.eScrollMode == EScrollMode.HBSCROLL )
if ( pChip.eScrollMode == EScrollMode.BMSCROLL || pChip.eScrollMode == EScrollMode.HBSCROLL )
{
/*
@ -4536,6 +4536,27 @@ namespace TJAPlayer3
}
this.t進行描画_チップ_小節線(configIni, ref dTX, ref pChip, nPlayer);
break;
case 0x09:
if (!pChip.bHit && (pChip.nバーからの距離dot.Taiko < 0))
{
pChip.bHit = true;
}
break;
case 0x0A:
if (!pChip.bHit && (pChip.nバーからの距離dot.Taiko < 0))
{
pChip.bHit = true;
}
break;
case 0x0B:
if (!pChip.bHit && (pChip.nバーからの距離dot.Taiko < 0))
{
pChip.bHit = true;
}
break;
#endregion
#region [ その他(未定義) ]

49
OpenTaiko/src/Stages/07.Game/Taiko/CAct演奏DrumsDancer.cs
View File

@ -21,7 +21,50 @@ namespace TJAPlayer3
public override void Activate()
{
//this.ct踊り子モーション = new CCounter();
string presetSection = "";
if (TJAPlayer3.stage選曲.n確定された曲の難易度[0] == (int)Difficulty.Tower)
{
}
else if (TJAPlayer3.stage選曲.n確定された曲の難易度[0] == (int)Difficulty.Dan)
{
presetSection = "Dan";
}
else if (TJAPlayer3.ConfigIni.bAIBattleMode)
{
}
else
{
presetSection = "Regular";
}
object _ps = null;
switch (presetSection)
{
case "Regular":
_ps = TJAPlayer3.Skin.Game_SkinScenes.Regular;
break;
case "Dan":
_ps = TJAPlayer3.Skin.Game_SkinScenes.Dan;
break;
default:
break;
};
var preset = (_ps != null
&& TJAPlayer3.stage選曲.r確定された曲.strScenePreset != null
&& ((Dictionary<string, DBSkinPreset.SkinScene>)_ps).ContainsKey(TJAPlayer3.stage選曲.r確定された曲.strScenePreset))
? ((Dictionary<string,DBSkinPreset.SkinScene>)_ps)[TJAPlayer3.stage選曲.r確定された曲.strScenePreset]
: null;
if (_ps != null
&& TJAPlayer3.DTX.scenePreset != null
&& ((Dictionary<string, DBSkinPreset.SkinScene>)_ps).ContainsKey(TJAPlayer3.DTX.scenePreset)) // If currently selected song has valid SCENEPRESET metadata within TJA
{
preset = ((Dictionary<string, DBSkinPreset.SkinScene>)_ps)[TJAPlayer3.DTX.scenePreset];
}
Random random = new Random();
Dancer = new CTexture[5][];
@ -31,7 +74,11 @@ namespace TJAPlayer3
var dirs = System.IO.Directory.GetDirectories($@"{dancerOrigindir}");
if (dirs.Length > 0)
{
var path = dirs[random.Next(0, dirs.Length)];
var _presetPath = (preset != null) ? $@"{dancerOrigindir}" + preset.DancerSet : "";
var path = (preset != null && System.IO.Directory.Exists(_presetPath))
? _presetPath
: dirs[random.Next(0, dirs.Length)];
LoadDancerConifg(path);
nDancerPtn = TJAPlayer3.t連番画像の枚数を数える($@"{path}{Path.DirectorySeparatorChar}1{Path.DirectorySeparatorChar}");

2
OpenTaiko/src/Stages/07.Game/Taiko/CAct演奏Drumsキャラクター.cs
View File

@ -160,7 +160,7 @@ namespace TJAPlayer3
{
if (!TJAPlayer3.stage演奏ドラム画面.bPAUSE)
{
nNowCharaCounter[i] += ((Math.Abs((float)TJAPlayer3.stage演奏ドラム画面.actPlayInfo.dbBPM[i]) / 60.0f) * (float)TJAPlayer3.FPS.DeltaTime) * nCharaFrameCount[i] / nCharaBeat[i];
nNowCharaCounter[i] += ((Math.Abs((float)TJAPlayer3.stage演奏ドラム画面.actPlayInfo.dbBPM[i]) / 60.0f) * (float)TJAPlayer3.FPS.DeltaTime) * (nCharaFrameCount[i] + 1) / nCharaBeat[i];
}
}
void updateBalloon()

10
OpenTaiko/src/Stages/07.Game/Taiko/CAct演奏DrumsチップファイアD.cs
View File

@ -287,16 +287,10 @@ namespace TJAPlayer3
case E判定.Perfect:
case E判定.Great:
case E判定.Auto:
if (!this.st状態_大[i].ct進行.IsStoped && TJAPlayer3.Tx.Effects_Hit_Explosion_Big != null && this.st状態_大[i].nIsBig == 1)
TJAPlayer3.Tx.Effects_Hit_Explosion.t2D描画(nX, nY, new Rectangle(this.st状態[i].ct進行.CurrentValue * nWidth, n + nHeight, nWidth, nHeight));
else
TJAPlayer3.Tx.Effects_Hit_Explosion.t2D描画(nX, nY, new Rectangle(this.st状態[i].ct進行.CurrentValue * nWidth, n, nWidth, nHeight));
TJAPlayer3.Tx.Effects_Hit_Explosion.t2D描画(nX, nY, new Rectangle(this.st状態[i].ct進行.CurrentValue * nWidth, n, nWidth, nHeight));
break;
case E判定.Good:
if (!this.st状態_大[i].ct進行.IsStoped && TJAPlayer3.Tx.Effects_Hit_Explosion_Big != null && this.st状態_大[i].nIsBig == 1)
TJAPlayer3.Tx.Effects_Hit_Explosion.t2D描画( nX, nY, new Rectangle( this.st状態[ i ].ct進行.CurrentValue * nWidth, n + (n * nHeight), nWidth, nHeight) );
else
TJAPlayer3.Tx.Effects_Hit_Explosion.t2D描画(nX, nY, new Rectangle(this.st状態[i].ct進行.CurrentValue * nWidth, n + nHeight, nWidth, nHeight));
TJAPlayer3.Tx.Effects_Hit_Explosion.t2D描画(nX, nY, new Rectangle(this.st状態[i].ct進行.CurrentValue * nWidth, n + nHeight, nWidth, nHeight));
break;
case E判定.Mine:
TJAPlayer3.Tx.Effects_Hit_Bomb?.t2D描画(nX, nY, new Rectangle(this.st状態[i].ct進行.CurrentValue * nBombWidth, 0, nBombWidth, nBombHeight));

8
OpenTaiko/src/Stages/07.Game/Taiko/CStage演奏ドラム画面.cs
View File

@ -1975,7 +1975,7 @@ namespace TJAPlayer3
if( pChip.dbSCROLL_Y != 0.0 )
{
var dbSCROLL = configIni.eScrollMode == EScrollMode.BMSCROLL ? 1.0 : pChip.dbSCROLL;
var dbSCROLL = pChip.eScrollMode == EScrollMode.BMSCROLL ? 1.0 : pChip.dbSCROLL;
y = NoteOriginY[nPlayer];
@ -1985,7 +1985,7 @@ namespace TJAPlayer3
long time = pChip.n発声時刻ms - __dbt;
float play_bpm_time = this.GetNowPBMTime(dTX, 0);
y += NotesManager.GetNoteY(pChip, time * pChip.dbBPM, _scrollSpeed, TJAPlayer3.Skin.Game_Notes_Interval, play_bpm_time, configIni.eScrollMode, false);
y += NotesManager.GetNoteY(pChip, time * pChip.dbBPM, _scrollSpeed, TJAPlayer3.Skin.Game_Notes_Interval, play_bpm_time, pChip.eScrollMode, false);
}
if (bSplitLane[nPlayer] || TJAPlayer3.Tx.Puchichara[PuchiChara.tGetPuchiCharaIndexByName(TJAPlayer3.GetActualPlayer(nPlayer))].effect.SplitLane)
@ -2250,7 +2250,7 @@ namespace TJAPlayer3
long __dbt = nowTime;
long time = pChip.n発声時刻ms - __dbt;
float play_bpm_time = this.GetNowPBMTime(dTX, 0);
y += NotesManager.GetNoteY(pChip, time * pChip.dbBPM, _scrollSpeed, TJAPlayer3.Skin.Game_Notes_Interval, play_bpm_time, configIni.eScrollMode, false);
y += NotesManager.GetNoteY(pChip, time * pChip.dbBPM, _scrollSpeed, TJAPlayer3.Skin.Game_Notes_Interval, play_bpm_time, pChip.eScrollMode, false);
}
if (bSplitLane[nPlayer] || TJAPlayer3.Tx.Puchichara[PuchiChara.tGetPuchiCharaIndexByName(TJAPlayer3.GetActualPlayer(nPlayer))].effect.SplitLane)
@ -2513,7 +2513,7 @@ namespace TJAPlayer3
long __dbt = (long)(SoundManager.PlayTimer.NowTimeMs * (((double)TJAPlayer3.ConfigIni.n演奏速度) / 20.0));
long time = pChip.n発声時刻ms - __dbt;
float play_bpm_time = this.GetNowPBMTime(dTX, 0);
y += NotesManager.GetNoteY(pChip, time * pChip.dbBPM, _scrollSpeed, TJAPlayer3.Skin.Game_Notes_Interval, play_bpm_time, configIni.eScrollMode, false);
y += NotesManager.GetNoteY(pChip, time * pChip.dbBPM, _scrollSpeed, TJAPlayer3.Skin.Game_Notes_Interval, play_bpm_time, pChip.eScrollMode, false);
//y += (int)(((pChip.n発声時刻ms - (CSound管理.rc演奏用タイマ.n現在時刻 * (((double)TJAPlayer3.ConfigIni.n演奏速度) / 20.0))) * pChip.dbBPM * pChip.dbSCROLL_Y * (this.act譜面スクロール速度.db現在の譜面スクロール速度[nPlayer] + 1.5)) / 628.7);
}

194
OpenTaiko/src/Stages/08.Result/CActResultParameterPanel.cs
View File

@ -198,6 +198,21 @@ namespace TJAPlayer3
ttkAISection[i] = new CActSelect曲リスト.TitleTextureKey($"{i + 1}区", pfAISectionText, Color.White, Color.Black, 1280);
}
for (int i = 0; i < 5; i++)
{
ttkSpeechText[i] = new CActSelect曲リスト.TitleTextureKey[6];
int _charaId = TJAPlayer3.SaveFileInstances[TJAPlayer3.GetActualPlayer(i)].data.Character;
for (int j = 0; j < 6; j++)
{
// { "simplestyleSweat", "...", "○", "◎", "★", "!!!!" }
ttkSpeechText[i][j] = new CActSelect曲リスト.TitleTextureKey(
TJAPlayer3.Tx.Characters[_charaId].metadata.SpeechText[j].GetString(""),
pfSpeechText, Color.White, Color.Black, TJAPlayer3.Skin.Result_Speech_Text_MaxWidth);
}
}
ct全体進行 = new CCounter(0, 50000, 1, TJAPlayer3.Timer);
@ -223,6 +238,8 @@ namespace TJAPlayer3
ctAISectionChange = new CCounter(0, 2000, 1, TJAPlayer3.Timer);
ctAISectionChange.CurrentValue = 255;
ctUIMove = new CCounter();
for (int i = 0; i < 5; i++)
{
CResultCharacter.tMenuResetTimer(CResultCharacter.ECharacterResult.NORMAL);
@ -267,12 +284,14 @@ namespace TJAPlayer3
}
public override void CreateManagedResource()
{
pfSpeechText = new CCachedFontRenderer(TJAPlayer3.ConfigIni.FontName, TJAPlayer3.Skin.Result_Speech_Text_Size);
pfAISectionText = new CCachedFontRenderer(TJAPlayer3.ConfigIni.FontName, TJAPlayer3.Skin.Result_AIBattle_SectionText_Scale);
base.CreateManagedResource();
}
public override void ReleaseManagedResource()
{
TJAPlayer3.t安全にDisposeする(ref pfSpeechText);
TJAPlayer3.t安全にDisposeする(ref pfAISectionText);
base.ReleaseManagedResource();
@ -326,11 +345,16 @@ namespace TJAPlayer3
}
else
{
namePlate_x[i] = TJAPlayer3.Skin.Result_NamePlate_X[i];
namePlate_y[i] = TJAPlayer3.Skin.Result_NamePlate_Y[i];
int pos = i;
if (TJAPlayer3.P1IsBlue())
pos = 1;
namePlate_x[pos] = TJAPlayer3.Skin.Result_NamePlate_X[pos];
namePlate_y[pos] = TJAPlayer3.Skin.Result_NamePlate_Y[pos];
}
}
ctUIMove.Tick();
#region [ Ensou result contents ]
int AnimeCount = 3000 + GaugeFactor * 59;
@ -341,6 +365,14 @@ namespace TJAPlayer3
int shift = 635;
int uioffset_x = 0;
double uioffset_value = Math.Sin((ctUIMove.CurrentValue / 1000.0) * Math.PI / 2.0);
if (is1P)
{
uioffset_x = (int)(uioffset_value * TJAPlayer3.Skin.Resolution[0] / 2.0);
if (is2PSide) uioffset_x *= -1;
}
for (int i = 0; i < TJAPlayer3.ConfigIni.nPlayerCount; i++)
{
if (TJAPlayer3.ConfigIni.bAIBattleMode && i == 1) break;
@ -357,9 +389,9 @@ namespace TJAPlayer3
if (TJAPlayer3.ConfigIni.nPlayerCount <= 2)
{
if (shiftPos == 0)
TJAPlayer3.Tx.Result_Panel.t2D描画(0, 0);
TJAPlayer3.Tx.Result_Panel.t2D描画(0 + uioffset_x, 0);
else
TJAPlayer3.Tx.Result_Panel_2P.t2D描画(0, 0);
TJAPlayer3.Tx.Result_Panel_2P.t2D描画(0 + uioffset_x, 0);
}
else
{
@ -401,9 +433,9 @@ namespace TJAPlayer3
else
{
_frame.vc拡大縮小倍率.X = 1.0f;
bar_x = TJAPlayer3.Skin.Result_DifficultyBar_X[pos];
bar_x = TJAPlayer3.Skin.Result_DifficultyBar_X[pos] + uioffset_x;
bar_y = TJAPlayer3.Skin.Result_DifficultyBar_Y[pos];
gauge_base_x = TJAPlayer3.Skin.Result_Gauge_Base_X[pos];
gauge_base_x = TJAPlayer3.Skin.Result_Gauge_Base_X[pos] + uioffset_x;
gauge_base_y = TJAPlayer3.Skin.Result_Gauge_Base_Y[pos];
}
@ -451,7 +483,7 @@ namespace TJAPlayer3
}
if (!ct虹ゲージアニメ.IsTicked)
ct虹ゲージアニメ.Start(0, 40, 1000 / 60, TJAPlayer3.Timer);
ct虹ゲージアニメ.Start(0, TJAPlayer3.Skin.Result_Gauge_Rainbow_Ptn - 1, TJAPlayer3.Skin.Result_Gauge_Rainbow_Interval, TJAPlayer3.Timer);
if (!ctSoul.IsTicked)
ctSoul.Start(0, 8, 33, TJAPlayer3.Timer);
@ -461,7 +493,7 @@ namespace TJAPlayer3
}
}
HGaugeMethods.UNSAFE_DrawResultGaugeFast(i, shiftPos, pos, ctゲージアニメ[i].CurrentValue, ct虹ゲージアニメ.CurrentValue, ctSoul.CurrentValue);
HGaugeMethods.UNSAFE_DrawResultGaugeFast(i, shiftPos, pos, ctゲージアニメ[i].CurrentValue, ct虹ゲージアニメ.CurrentValue, ctSoul.CurrentValue, uioffset_x);
#endregion
}
@ -574,7 +606,7 @@ namespace TJAPlayer3
if ((k != 5 || TJAPlayer3.Skin.Result_ADLib_Show) && (k != 6 || TJAPlayer3.Skin.Result_Bomb_Show))
{
this.t小文字表示(num_x[k][pos], num_y[k][pos], scoresArr[k]);
this.t小文字表示(num_x[k][pos] + uioffset_x, num_y[k][pos], scoresArr[k]);
}
TJAPlayer3.Tx.Result_Number.vc拡大縮小倍率.X = 1f;
@ -613,7 +645,7 @@ namespace TJAPlayer3
}
else
{
score_x = TJAPlayer3.Skin.Result_Score_X[pos];
score_x = TJAPlayer3.Skin.Result_Score_X[pos] + uioffset_x;
score_y = TJAPlayer3.Skin.Result_Score_Y[pos];
}
@ -745,6 +777,8 @@ namespace TJAPlayer3
if (!this.ctMountain_ClearIn.IsTicked)
this.ctMountain_ClearIn.Start(0, 515, 3, TJAPlayer3.Timer);
if (ctUIMove.EndValue != 1000 && TJAPlayer3.Skin.Result_Use1PUI && is1P) ctUIMove = new CCounter(0, 1000, 0.5, TJAPlayer3.Timer);
if (TJAPlayer3.stage結果.bClear[p])
{
@ -775,16 +809,66 @@ namespace TJAPlayer3
//int chara_x = TJAPlayer3.Skin.Characters_Result_X[_charaId][pos];
//int chara_y = TJAPlayer3.Skin.Characters_Result_Y[_charaId][pos];
int chara_x = namePlate_x[pos] + TJAPlayer3.Tx.NamePlateBase.szテクスチャサイズ.Width / 2;
int chara_x = namePlate_x[pos] - (TJAPlayer3.Skin.Characters_UseResult1P[_charaId] ? uioffset_x : 0) + TJAPlayer3.Tx.NamePlateBase.szテクスチャサイズ.Width / 2;
int chara_y = namePlate_y[pos];
int p1chara_x = is2PSide ? TJAPlayer3.Skin.Resolution[0] / 2 : 0;
int p1chara_y = TJAPlayer3.Skin.Resolution[1] - (int)(uioffset_value * TJAPlayer3.Skin.Resolution[1]);
float renderRatioX = TJAPlayer3.Skin.Resolution[0] / (float)TJAPlayer3.Skin.Characters_Resolution[_charaId][0];
float renderRatioY = TJAPlayer3.Skin.Resolution[1] / (float)TJAPlayer3.Skin.Characters_Resolution[_charaId][1];
if (CResultCharacter.tIsCounterProcessing(p, CResultCharacter.ECharacterResult.CLEAR))
{
CResultCharacter.tMenuDisplayCharacter(p, chara_x, chara_y, CResultCharacter.ECharacterResult.CLEAR, pos);
if (TJAPlayer3.Skin.Characters_UseResult1P[_charaId] && TJAPlayer3.Skin.Result_Use1PUI && TJAPlayer3.Tx.Characters_Result_Clear_1P[_charaId] != null)
{
TJAPlayer3.Tx.Characters_Result_Clear_1P[_charaId].vc拡大縮小倍率.X = renderRatioX;
TJAPlayer3.Tx.Characters_Result_Clear_1P[_charaId].vc拡大縮小倍率.Y = renderRatioY;
if (is2PSide)
{
TJAPlayer3.Tx.Characters_Result_Clear_1P[_charaId].t2D左右反転描画(p1chara_x, p1chara_y);
}
else
{
TJAPlayer3.Tx.Characters_Result_Clear_1P[_charaId].t2D描画(p1chara_x, p1chara_y);
}
}
}
else if (CResultCharacter.tIsCounterProcessing(p, CResultCharacter.ECharacterResult.FAILED))
{
CResultCharacter.tMenuDisplayCharacter(p, chara_x, chara_y, CResultCharacter.ECharacterResult.FAILED, pos);
else if (CResultCharacter.tIsCounterProcessing(p, CResultCharacter.ECharacterResult.FAILED_IN))
if (TJAPlayer3.Skin.Characters_UseResult1P[_charaId] && TJAPlayer3.Skin.Result_Use1PUI && TJAPlayer3.Tx.Characters_Result_Failed_1P[_charaId] != null)
{
TJAPlayer3.Tx.Characters_Result_Failed_1P[_charaId].vc拡大縮小倍率.X = renderRatioX;
TJAPlayer3.Tx.Characters_Result_Failed_1P[_charaId].vc拡大縮小倍率.Y = renderRatioY;
if (is2PSide)
{
TJAPlayer3.Tx.Characters_Result_Failed_1P[_charaId].t2D左右反転描画(p1chara_x, p1chara_y);
}
else
{
TJAPlayer3.Tx.Characters_Result_Failed_1P[_charaId].t2D描画(p1chara_x, p1chara_y);
}
}
}
else if (CResultCharacter.tIsCounterProcessing(p, CResultCharacter.ECharacterResult.FAILED_IN) && TJAPlayer3.Tx.Characters_Result_Failed_1P[_charaId] != null)
{
CResultCharacter.tMenuDisplayCharacter(p, chara_x, chara_y, CResultCharacter.ECharacterResult.FAILED_IN, pos);
if (TJAPlayer3.Skin.Characters_UseResult1P[_charaId] && TJAPlayer3.Skin.Result_Use1PUI)
{
TJAPlayer3.Tx.Characters_Result_Failed_1P[_charaId].vc拡大縮小倍率.X = renderRatioX;
TJAPlayer3.Tx.Characters_Result_Failed_1P[_charaId].vc拡大縮小倍率.Y = renderRatioY;
if (is2PSide)
{
TJAPlayer3.Tx.Characters_Result_Failed_1P[_charaId].t2D左右反転描画(p1chara_x, p1chara_y);
}
else
{
TJAPlayer3.Tx.Characters_Result_Failed_1P[_charaId].t2D描画(p1chara_x, p1chara_y);
}
}
}
else
CResultCharacter.tMenuDisplayCharacter(p, chara_x, chara_y, CResultCharacter.ECharacterResult.NORMAL, pos);
@ -895,6 +979,7 @@ namespace TJAPlayer3
// Speech Bubble
int Mood = 0;
int MoodV2 = 0;
if (gaugeValues[p] >= 100.0f)
Mood = 3;
@ -903,6 +988,37 @@ namespace TJAPlayer3
else if (gaugeValues[p] >= 40.0f)
Mood = 1;
if (TJAPlayer3.stage結果.nクリア[p] == 3)
{
MoodV2 = 5;
}
else if (TJAPlayer3.stage結果.nクリア[p] == 2)
{
MoodV2 = 4;
}
else if (TJAPlayer3.stage結果.nクリア[p] == 1)
{
if (gaugeValues[p] >= 100.0f)
{
MoodV2 = 3;
}
else
{
MoodV2 = 2;
}
}
else if (TJAPlayer3.stage結果.nクリア[p] == 0)
{
if (gaugeValues[p] >= 40.0f)
{
MoodV2 = 1;
}
else
{
MoodV2 = 0;
}
}
if (TJAPlayer3.ConfigIni.nPlayerCount <= 2)
{
int speechBuddle_width = TJAPlayer3.Tx.Result_Speech_Bubble[pos].szテクスチャサイズ.Width / 4;
@ -913,6 +1029,51 @@ namespace TJAPlayer3
TJAPlayer3.Tx.Result_Speech_Bubble[pos].t2D拡大率考慮中央基準描画(TJAPlayer3.Skin.Result_Speech_Bubble_X[pos], TJAPlayer3.Skin.Result_Speech_Bubble_Y[pos],
new Rectangle(Mood * speechBuddle_width, RandomText * speechBuddle_height, speechBuddle_width, speechBuddle_height));
}
int speech_vubble_index = TJAPlayer3.ConfigIni.nPlayerCount <= 2 ? pos : 2;
if (TJAPlayer3.Tx.Result_Speech_Bubble_V2[speech_vubble_index] != null)
{
int speechBuddle_width = TJAPlayer3.Tx.Result_Speech_Bubble_V2[speech_vubble_index].szテクスチャサイズ.Width;
int speechBuddle_height = TJAPlayer3.Tx.Result_Speech_Bubble_V2[speech_vubble_index].szテクスチャサイズ.Height / 6;
int speech_bubble_x;
int speech_bubble_y;
float scale;
if (TJAPlayer3.ConfigIni.nPlayerCount == 5)
{
speech_bubble_x = TJAPlayer3.Skin.Result_Speech_Bubble_V2_5P[0] + TJAPlayer3.Skin.Result_UIMove_5P_X[pos];
speech_bubble_y = TJAPlayer3.Skin.Result_Speech_Bubble_V2_5P[1] + TJAPlayer3.Skin.Result_UIMove_5P_Y[pos];
scale = 0.5f;
}
else if (TJAPlayer3.ConfigIni.nPlayerCount == 4 || TJAPlayer3.ConfigIni.nPlayerCount == 3)
{
speech_bubble_x = TJAPlayer3.Skin.Result_Speech_Bubble_V2_4P[0] + TJAPlayer3.Skin.Result_UIMove_4P_X[pos];
speech_bubble_y = TJAPlayer3.Skin.Result_Speech_Bubble_V2_4P[1] + TJAPlayer3.Skin.Result_UIMove_4P_Y[pos];
scale = 0.5f;
}
else if (TJAPlayer3.ConfigIni.nPlayerCount == 2)
{
speech_bubble_x = TJAPlayer3.Skin.Result_Speech_Bubble_V2_2P_X[pos];
speech_bubble_y = TJAPlayer3.Skin.Result_Speech_Bubble_V2_2P_Y[pos];
scale = 0.5f;
}
else
{
speech_bubble_x = TJAPlayer3.Skin.Result_Speech_Bubble_V2_X[pos];
speech_bubble_y = TJAPlayer3.Skin.Result_Speech_Bubble_V2_Y[pos];
scale = 1.0f;
}
TJAPlayer3.Tx.Result_Speech_Bubble_V2[speech_vubble_index].vc拡大縮小倍率.X = 0.9f * scale * (ct全体進行.CurrentValue <= MountainAppearValue + AddCount ? 1.3f - (float)Math.Sin((ct全体進行.CurrentValue - MountainAppearValue) / (AddCount / 90) * (Math.PI / 180)) * 0.3f : 1.0f);
TJAPlayer3.Tx.Result_Speech_Bubble_V2[speech_vubble_index].vc拡大縮小倍率.Y = 0.9f * scale * (ct全体進行.CurrentValue <= MountainAppearValue + AddCount ? 1.3f - (float)Math.Sin((ct全体進行.CurrentValue - MountainAppearValue) / (AddCount / 90) * (Math.PI / 180)) * 0.3f : 1.0f);
TJAPlayer3.Tx.Result_Speech_Bubble_V2[speech_vubble_index].t2D拡大率考慮中央基準描画(speech_bubble_x, speech_bubble_y,
new Rectangle(0, MoodV2 * speechBuddle_height, speechBuddle_width, speechBuddle_height));
TJAPlayer3.stage選曲.act曲リスト.ResolveTitleTexture(ttkSpeechText[p][MoodV2]).vc拡大縮小倍率.X = scale;
TJAPlayer3.stage選曲.act曲リスト.ResolveTitleTexture(ttkSpeechText[p][MoodV2]).vc拡大縮小倍率.Y = scale;
TJAPlayer3.stage選曲.act曲リスト.ResolveTitleTexture(ttkSpeechText[p][MoodV2]).t2D拡大率考慮中央基準描画(
speech_bubble_x + (int)(TJAPlayer3.Skin.Result_Speech_Text_Offset[0] * scale),
speech_bubble_y + (int)(TJAPlayer3.Skin.Result_Speech_Text_Offset[1] * scale));
}
if (!b音声再生[11])
{
if (gaugeValues[p] >= 80.0f)
@ -992,7 +1153,7 @@ namespace TJAPlayer3
}
else
{
scoreRankEffect_x = TJAPlayer3.Skin.Result_ScoreRankEffect_X[pos];
scoreRankEffect_x = TJAPlayer3.Skin.Result_ScoreRankEffect_X[pos] + uioffset_x;
scoreRankEffect_y = TJAPlayer3.Skin.Result_ScoreRankEffect_Y[pos];
}
@ -1067,7 +1228,7 @@ namespace TJAPlayer3
}
else
{
crownEffect_x = TJAPlayer3.Skin.Result_CrownEffect_X[pos];
crownEffect_x = TJAPlayer3.Skin.Result_CrownEffect_X[pos] + uioffset_x;
crownEffect_y = TJAPlayer3.Skin.Result_CrownEffect_Y[pos];
}
@ -1162,10 +1323,15 @@ namespace TJAPlayer3
private CActSelect曲リスト.TitleTextureKey[] ttkAISection;
private CActSelect曲リスト.TitleTextureKey[][] ttkSpeechText = new CActSelect曲リスト.TitleTextureKey[5][];
private CCachedFontRenderer pfSpeechText;
private CCachedFontRenderer pfAISectionText;
private CCounter ctAISectionChange;
private CCounter ctUIMove;
private int nNowAISection;
private void NextAISection()

2
OpenTaiko/src/Stages/08.Result/CActResultSongBar.cs
View File

@ -43,7 +43,7 @@ namespace TJAPlayer3
{
this.txMusicName = TJAPlayer3.tテクスチャの生成(bmpSongTitle, false);
txMusicName.vc拡大縮小倍率.X = TJAPlayer3.GetSongNameXScaling(ref txMusicName);
txMusicName.vc拡大縮小倍率.X = TJAPlayer3.GetSongNameXScaling(ref txMusicName, TJAPlayer3.Skin.Result_MusicName_MaxSize);
}
base.Activate();

8
OpenTaiko/src/Stages/CActNewHeya.cs
View File

@ -560,7 +560,13 @@ namespace TJAPlayer3
if (TJAPlayer3.Tx.Puchichara[index].unlock != null
&& !TJAPlayer3.SaveFileInstances[CurrentPlayer].data.UnlockedPuchicharas.Contains(TJAPlayer3.Skin.Puchicharas_Name[index]))
TJAPlayer3.Tx.NewHeya_Lock?.t2D描画(x + TJAPlayer3.Skin.SongSelect_NewHeya_InfoSection_Offset[0], y + TJAPlayer3.Skin.SongSelect_NewHeya_InfoSection_Offset[1]);
{
TJAPlayer3.Tx.NewHeya_Lock?.t2D描画(x + TJAPlayer3.Skin.SongSelect_NewHeya_Lock_Offset[0], y + TJAPlayer3.Skin.SongSelect_NewHeya_Lock_Offset[1]);
if (this.ttkInfoSection != null)
TJAPlayer3.stage選曲.act曲リスト.ResolveTitleTexture(this.ttkInfoSection)
.t2D拡大率考慮上中央基準描画(x + TJAPlayer3.Skin.SongSelect_NewHeya_InfoSection_Offset[0], y + TJAPlayer3.Skin.SongSelect_NewHeya_InfoSection_Offset[1]);
}
}
break;
case ModeType.SubTitle: