mirrors/HeavenStudio
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

minor bug fixes

Browse source
This commit is contained in:
streitixy 2024-02-22 15:58:04 -03:00
parent fbb82cc5b3
commit 31eb8a7876
12 changed files with 147 additions and 4149 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

415
Assets/Resources/Fonts/Kurokane.asset
View file

File diff suppressed because one or more lines are too long

69
Assets/Resources/Fonts/Rodin DB.asset
View file

File diff suppressed because one or more lines are too long

2
Assets/Resources/Fonts/WarioWareV2 SDF 1.mat
View file

@ -105,7 +105,7 @@ Material:
- _WeightBold: 0.75 - _WeightBold: 0.75
- _WeightNormal: 0 - _WeightNormal: 0
m_Colors: m_Colors:
- _ClipRect: {r: -10, g: -10, b: -10, a: 10} - _ClipRect: {r: -10, g: -10, b: -7, a: 10}
- _Color: {r: 1, g: 1, b: 1, a: 1} - _Color: {r: 1, g: 1, b: 1, a: 1}
- _EnvMatrixRotation: {r: 0, g: 0, b: 0, a: 0} - _EnvMatrixRotation: {r: 0, g: 0, b: 0, a: 0}
- _FaceColor: {r: 1, g: 1, b: 1, a: 1} - _FaceColor: {r: 1, g: 1, b: 1, a: 1}

2
Assets/Resources/Fonts/WarioWareV2 SDF 4.mat
View file

@ -105,7 +105,7 @@ Material:
- _WeightBold: 0.75 - _WeightBold: 0.75
- _WeightNormal: 0 - _WeightNormal: 0
m_Colors: m_Colors:
- _ClipRect: {r: -10, g: -10, b: -7.540926, a: 10} - _ClipRect: {r: -10, g: -10, b: -8.370649, a: 10}
- _Color: {r: 1, g: 1, b: 1, a: 1} - _Color: {r: 1, g: 1, b: 1, a: 1}
- _EnvMatrixRotation: {r: 0, g: 0, b: 0, a: 0} - _EnvMatrixRotation: {r: 0, g: 0, b: 0, a: 0}
- _FaceColor: {r: 1, g: 1, b: 1, a: 1} - _FaceColor: {r: 1, g: 1, b: 1, a: 1}

781
Assets/Resources/Fonts/WarioWareV2 SDF.asset
View file

File diff suppressed because one or more lines are too long

2108
Assets/Resources/Fonts/rodin/FOT-Rodin Pro B SDF Dynamic.asset
View file

File diff suppressed because one or more lines are too long

804
Assets/Resources/Fonts/rodin/FOT-Rodin Pro B SDF Dynamic_Outline.asset
View file

File diff suppressed because one or more lines are too long

1
Assets/Resources/Games/bonOdori.prefab
View file

@ -7098,7 +7098,6 @@ MonoBehaviour:
DarkPlane: {fileID: 8600589182512249935} DarkPlane: {fileID: 8600589182512249935}
Player: {fileID: 8728714290611780215} Player: {fileID: 8728714290611780215}
Judge: {fileID: 7587793407961933664} Judge: {fileID: 7587793407961933664}
JudgeFace: {fileID: 0}
CPU1: {fileID: 9028841130226857946} CPU1: {fileID: 9028841130226857946}
CPU2: {fileID: 395900234149378562} CPU2: {fileID: 395900234149378562}
CPU3: {fileID: 6515992849541950419} CPU3: {fileID: 6515992849541950419}

4
Assets/Resources/Prefabs/GameView/GameTex.renderTexture
View file

@ -14,8 +14,8 @@ RenderTexture:
m_DownscaleFallback: 0 m_DownscaleFallback: 0
m_IsAlphaChannelOptional: 0 m_IsAlphaChannelOptional: 0
serializedVersion: 5 serializedVersion: 5
m_Width: 1214 m_Width: 1920
m_Height: 683 m_Height: 1080
m_AntiAliasing: 2 m_AntiAliasing: 2
m_MipCount: -1 m_MipCount: -1
m_DepthStencilFormat: 92 m_DepthStencilFormat: 92

4
Assets/Resources/Prefabs/GameView/OverlayTex.renderTexture
View file

@ -14,8 +14,8 @@ RenderTexture:
m_DownscaleFallback: 0 m_DownscaleFallback: 0
m_IsAlphaChannelOptional: 0 m_IsAlphaChannelOptional: 0
serializedVersion: 5 serializedVersion: 5
m_Width: 1821 m_Width: 2880
m_Height: 1024 m_Height: 1620
m_AntiAliasing: 1 m_AntiAliasing: 1
m_MipCount: -1 m_MipCount: -1
m_DepthStencilFormat: 92 m_DepthStencilFormat: 92

10
Assets/Scenes/Editor.unity
View file

@ -8906,7 +8906,7 @@ MonoBehaviour:
m_faceColor: m_faceColor:
serializedVersion: 2 serializedVersion: 2
rgba: 4294967295 rgba: 4294967295
m_fontSize: 4.35 m_fontSize: 14
m_fontSizeBase: 14.3 m_fontSizeBase: 14.3
m_fontWeight: 400 m_fontWeight: 400
m_enableAutoSizing: 1 m_enableAutoSizing: 1
@ -26851,7 +26851,7 @@ MonoBehaviour:
m_HandleRect: {fileID: 1589389271} m_HandleRect: {fileID: 1589389271}
m_Direction: 2 m_Direction: 2
m_Value: 1 m_Value: 1
m_Size: 0.24080037 m_Size: 0.4422289
m_NumberOfSteps: 0 m_NumberOfSteps: 0
m_OnValueChanged: m_OnValueChanged:
m_PersistentCalls: m_PersistentCalls:
@ -32707,7 +32707,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0.5} m_AnchorMin: {x: 0, y: 0.5}
m_AnchorMax: {x: 1, y: 0.5} m_AnchorMax: {x: 1, y: 0.5}
m_AnchoredPosition: {x: 0, y: 44.075172} m_AnchoredPosition: {x: 0, y: 199.00056}
m_SizeDelta: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 1} m_Pivot: {x: 0.5, y: 1}
--- !u!222 &1154875945 --- !u!222 &1154875945
@ -43455,8 +43455,8 @@ MonoBehaviour:
m_TargetGraphic: {fileID: 1220118245} m_TargetGraphic: {fileID: 1220118245}
m_HandleRect: {fileID: 1220118244} m_HandleRect: {fileID: 1220118244}
m_Direction: 2 m_Direction: 2
m_Value: 1.0000001 m_Value: 1
m_Size: 0 m_Size: 1
m_NumberOfSteps: 0 m_NumberOfSteps: 0
m_OnValueChanged: m_OnValueChanged:
m_PersistentCalls: m_PersistentCalls:

96
Assets/Scripts/Games/BonOdori/BonOdori.cs
View file

@ -172,7 +172,9 @@ namespace HeavenStudio.Games
string prefix; string prefix;
double beatUniversal; double beatUniversal;
string suffix; string suffix;
bool goBop; bool goBopDonpans;
bool goBopJudge;
bool bopDonpans;
string originalText1; string originalText1;
string originalText2; string originalText2;
string originalText3; string originalText3;
@ -281,7 +283,7 @@ namespace HeavenStudio.Games
{ {
if (PlayerInput.GetIsAction(BonOdori.InputAction_BasicPress) && !IsExpectingInputNow(InputAction_BasicPress)){ if (PlayerInput.GetIsAction(BonOdori.InputAction_BasicPress) && !IsExpectingInputNow(InputAction_BasicPress)){
ScoreMiss(); ScoreMiss();
SoundByte.PlayOneShot("miss"); SoundByte.PlayOneShotGame("bonOdori/clap");
@ -303,64 +305,52 @@ namespace HeavenStudio.Games
switch (typeSpeak){ switch (typeSpeak){
case 0: case 0:
ScheduleInput(beat, 0f, InputAction_BasicPress, Success, Miss, Empty);
switch (variation){ switch (variation){
case 0: case 0:
MultiSound.Play(new MultiSound.Sound[]{ SoundByte.PlayOneShotGame("bonOdori/pan1");
new MultiSound.Sound("bonOdori/pan1", beat, offset: 0.01f)});
break; break;
case 1: case 1:
MultiSound.Play(new MultiSound.Sound[]{ SoundByte.PlayOneShotGame("bonOdori/pan2"); break;
new MultiSound.Sound("bonOdori/pan2", beat, offset: 0.01f)});
break;
case 2: case 2:
MultiSound.Play(new MultiSound.Sound[]{ SoundByte.PlayOneShotGame("bonOdori/pan3");
new MultiSound.Sound("bonOdori/pan3", beat, offset: 0.01f)});
break;} break;}
break; break;
case 2: case 2:
ScheduleInput(beat,0f, InputAction_BasicPress, Success, Miss, Empty);
switch (variation){ switch (variation){
case 0: case 0:
MultiSound.Play(new MultiSound.Sound[]{ SoundByte.PlayOneShotGame("bonOdori/pa_n1");
new MultiSound.Sound("bonOdori/pa_n1", beat, offset: 0.01f)});
break; break;
case 1: case 1:
MultiSound.Play(new MultiSound.Sound[]{ SoundByte.PlayOneShotGame("bonOdori/pa_n2");
new MultiSound.Sound("bonOdori/pa_n2", beat, offset: 0.01f)});
break;} break;}
break; break;
case 1: case 1:
ScheduleInput(beat, 0f, InputAction_BasicPress, Success, Miss, Empty); SoundByte.PlayOneShotGame("bonOdori/pa1");
MultiSound.Play(new MultiSound.Sound[]{
new MultiSound.Sound("bonOdori/pa1", beat, offset: 0.01f)});
break; break;
beatUniversal = beat;
}}} }
beatUniversal = beat;
ScheduleInput(beat, 0f, InputAction_BasicPress, Success, Miss, Empty);}}
public void Sound(double beat, int variation, int typeSpeak ) public void Sound(double beat, int variation, int typeSpeak )
{ switch (typeSpeak){ { switch (typeSpeak){
case 0: case 0:
switch (variation){ switch (variation){
case 0: case 0:
MultiSound.Play(new MultiSound.Sound[] { SoundByte.PlayOneShotGame("bonOdori/don1");
new MultiSound.Sound("bonOdori/don1", beat, offset: 0.01f)});
break; break;
case 1: case 1:
MultiSound.Play(new MultiSound.Sound[] { SoundByte.PlayOneShotGame("bonOdori/don2");
new MultiSound.Sound("bonOdori/don2", beat, offset: 0.01f)});
break; break;
case 2: case 2:
MultiSound.Play(new MultiSound.Sound[] { SoundByte.PlayOneShotGame("bonOdori/don3");
new MultiSound.Sound("bonOdori/don3", beat, offset: 0.01f)});
break; break;
case 3: case 3:
MultiSound.Play(new MultiSound.Sound[] { SoundByte.PlayOneShotGame("bonOdori/don4");
new MultiSound.Sound("bonOdori/don4", beat, offset: 0.01f)});
break; break;
} }
@ -370,12 +360,10 @@ namespace HeavenStudio.Games
switch (variation) { switch (variation) {
case 0: case 0:
MultiSound.Play(new MultiSound.Sound[] { SoundByte.PlayOneShotGame("bonOdori/do_n1");
new MultiSound.Sound("bonOdori/do_n1", beat, offset: 0.01f)});
break; break;
case 1: case 1:
MultiSound.Play(new MultiSound.Sound[] { SoundByte.PlayOneShotGame("bonOdori/do_n2");
new MultiSound.Sound("bonOdori/do_n2", beat, offset: 0.01f)});
break; break;
} }
break; break;
@ -383,12 +371,10 @@ namespace HeavenStudio.Games
case 1: case 1:
switch (variation){ switch (variation){
case 0: case 0:
MultiSound.Play(new MultiSound.Sound[] { SoundByte.PlayOneShotGame("bonOdori/do1");
new MultiSound.Sound("bonOdori/do1", beat, offset: 0.01f)});
break; break;
case 1: case 1:
MultiSound.Play(new MultiSound.Sound[] { SoundByte.PlayOneShotGame("bonOdori/do2");
new MultiSound.Sound("bonOdori/do2", beat, offset: 0.01f)});
break; break;
} }
@ -570,8 +556,10 @@ namespace HeavenStudio.Games
public void Bop(double beat, float length, bool shouldBop, bool autoBop) public void Bop(double beat, float length, bool shouldBop, bool autoBop)
{ {
if (!shouldBop) { goBop = false; return; } if (!shouldBop) { goBopDonpans = false; goBopJudge = false; return; }
goBop = autoBop; goBopDonpans = autoBop;
goBopJudge = autoBop;
if (autoBop) { return;}
if (shouldBop) if (shouldBop)
{ {
for (int i = 0; i < length; i++) for (int i = 0; i < length; i++)
@ -586,6 +574,15 @@ namespace HeavenStudio.Games
CPU3.Play("Bop"); CPU3.Play("Bop");
Judge.Play("Bop"); Judge.Play("Bop");
}),
new BeatAction.Action(beat + length, delegate
{
Player.Play("NeutralBopped");
CPU1.Play("NeutralBopped");
CPU2.Play("NeutralBopped");
CPU3.Play("NeutralBopped");
}) })
}); });
} }
@ -596,14 +593,22 @@ namespace HeavenStudio.Games
} }
public void Bow(double beat, float length) public void Bow(double beat, float length)
{ {
goBop = false; if (goBopDonpans == true)
{
bopDonpans = true;
}
else
{
bopDonpans = false;
}
goBopDonpans = false;
Player.Play("Bow"); Player.Play("Bow");
CPU1.Play("Bow"); CPU1.Play("Bow");
CPU2.Play("Bow"); CPU2.Play("Bow");
CPU3.Play("Bow"); CPU3.Play("Bow");
BeatAction.New(instance, new List<BeatAction.Action>() BeatAction.New(instance, new List<BeatAction.Action>()
{ {
new BeatAction.Action(beat + length, delegate { Player.Play("NeutralBopped"); CPU1.Play("NeutralBopped");CPU2.Play("NeutralBopped"); CPU3.Play("NeutralBopped");}) new BeatAction.Action(beat + length, delegate { Player.Play("NeutralBopped"); CPU1.Play("NeutralBopped");CPU2.Play("NeutralBopped"); CPU3.Play("NeutralBopped"); if (bopDonpans) {goBopDonpans = true;}})
}); });
} }
public void Spin(double beat, float length) public void Spin(double beat, float length)
@ -613,15 +618,18 @@ namespace HeavenStudio.Games
public override void OnBeatPulse(double beat) public override void OnBeatPulse(double beat)
{ {
if (goBop) if (goBopDonpans)
{ {
Player.Play("Bop"); Player.Play("Bop");
CPU1.Play("Bop"); CPU1.Play("Bop");
CPU2.Play("Bop"); CPU2.Play("Bop");
CPU3.Play("Bop"); CPU3.Play("Bop");
Judge.Play("Bop");
} }
if (goBopJudge)
{
Judge.Play("Bop");
}
} }
public void DarkBG(double beat, bool toggle) public void DarkBG(double beat, bool toggle)
{ {