Taiko_Stuff/OpenTaiko
1
0
Fork 0
mirror of synced 2025-02-06 22:34:26 +01:00
Code Releases Activity

起動時のクラッシュを修正 (#528)

Browse Source 
* 起動時のクラッシュを修正

* ちょっと修正
This commit is contained in:
Takkkom 2023-11-18 08:18:42 +09:00 committed by GitHub
parent 750cfef3c5
commit 88c46bde28
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 19 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
OpenTaiko/BGScriptAPI.lua
View File

@ -10,6 +10,7 @@ local battleState = 0
local battleWin = false
local gauge = { 0, 0, 0, 0, 0 }
local bpm = { 0, 0, 0, 0, 0 }
local gogo = { false, false, false, false, false }
function setConstValues(_playerCount, _p1IsBlue, _lang)
playerCount = _playerCount
@ -17,7 +18,7 @@ function setConstValues(_playerCount, _p1IsBlue, _lang)
lang = _lang
end
function updateValues(_deltaTime, _fps, _isClear, _towerNightNum, _battleState, _battleWin, _gauge, _bpm)
function updateValues(_deltaTime, _fps, _isClear, _towerNightNum, _battleState, _battleWin, _gauge, _bpm, _gogo)
deltaTime = _deltaTime
fps = _fps
isClear = _isClear
@ -26,4 +27,5 @@ function updateValues(_deltaTime, _fps, _isClear, _towerNightNum, _battleState,
battleWin = _battleWin
gauge = _gauge
bpm = _bpm
gogo = _gogo
end

21
OpenTaiko/src/Stages/01.StartUp/CStage起動.cs
View File

@ -183,19 +183,20 @@ namespace TJAPlayer3
}
else
{
if ( es != null && es.IsSongListEnumCompletelyDone ) // 曲リスト作成が終わったら
{
TJAPlayer3.Songs管理 = ( es != null ) ? es.Songs管理 : null; // 最後に、曲リストを拾い上げる
if(TJAPlayer3.Input管理.Keyboard.KeyPressed((int)SlimDXKeys.Key.Return))
{
TJAPlayer3.Skin.sound決定音.t再生する();
return 1;
}
}
TJAPlayer3.Tx.Readme.t2D描画(0, 0);
}
if ( es != null && es.IsSongListEnumCompletelyDone ) // 曲リスト作成が終わったら
{
TJAPlayer3.Songs管理 = ( es != null ) ? es.Songs管理 : null; // 最後に、曲リストを拾い上げる
if(TJAPlayer3.Input管理.Keyboard.KeyPressed((int)SlimDXKeys.Key.Return))
{
TJAPlayer3.Skin.sound決定音.t再生する();
return 1;
}
}
}
return 0;
}

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

@ -1014,15 +1014,15 @@ namespace TJAPlayer3
break;
case Anime.Balloon_Breaking:
nCharaFrameCount[player] = TJAPlayer3.Skin.Characters_Balloon_Breaking_Ptn[iCurrentCharacter[player]] - 1;
nCharaBeat[player] = 0.4f;
nCharaBeat[player] = 0.2f;
break;
case Anime.Balloon_Broke:
nCharaFrameCount[player] = TJAPlayer3.Skin.Characters_Balloon_Broke_Ptn[iCurrentCharacter[player]] - 1;
nCharaBeat[player] = 0.4f;
nCharaBeat[player] = 0.2f;
break;
case Anime.Balloon_Miss:
nCharaFrameCount[player] = TJAPlayer3.Skin.Characters_Balloon_Miss_Ptn[iCurrentCharacter[player]] - 1;
nCharaBeat[player] = 0.4f;
nCharaBeat[player] = 0.2f;
break;
case Anime.Kusudama_Idle:
nCharaFrameCount[player] = TJAPlayer3.Skin.Characters_Kusudama_Idle_Ptn[iCurrentCharacter[player]] - 1;

3
OpenTaiko/src/Stages/07.Game/Taiko/ScriptBG.cs
View File

@ -287,7 +287,8 @@ namespace TJAPlayer3
TJAPlayer3.stage演奏ドラム画面.AIBattleState,
TJAPlayer3.stage演奏ドラム画面.bIsAIBattleWin,
TJAPlayer3.stage演奏ドラム画面.actGauge.db現在のゲージ値,
TJAPlayer3.stage演奏ドラム画面.actPlayInfo.dbBPM);
TJAPlayer3.stage演奏ドラム画面.actPlayInfo.dbBPM,
TJAPlayer3.stage演奏ドラム画面.bIsGOGOTIME);
/*LuaScript.SetObjectToPath("fps", TJAPlayer3.FPS.n現在のFPS);
LuaScript.SetObjectToPath("deltaTime", TJAPlayer3.FPS.DeltaTime);
LuaScript.SetObjectToPath("isClear", TJAPlayer3.stage演奏ドラム画面.bIsAlreadyCleared);