fix selection of starting dance
This commit is contained in:
parent
88fa3ea5aa
commit
f2768de421
|
@ -761,7 +761,7 @@ MonoBehaviour:
|
|||
m_Script: {fileID: 11500000, guid: e57f95bd19852bc46a88eb6f67404fce, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
debugChoreography: {fileID: 11400000, guid: 3e7be124fd7381048a6eb0219990ba11, type: 2}
|
||||
debugChoreography: {fileID: 11400000, guid: 1d8cd7bea66e99945b457e88cb3e64e8, type: 2}
|
||||
choreographies:
|
||||
- {fileID: 11400000, guid: 3e7be124fd7381048a6eb0219990ba11, type: 2}
|
||||
- {fileID: 11400000, guid: 437f06b86f7597b4d865a4c958e61290, type: 2}
|
||||
|
|
|
@ -27,8 +27,6 @@ MonoBehaviour:
|
|||
beatLength: 6
|
||||
- stateName: KazotskyAlt
|
||||
beatLength: 2
|
||||
- stateName: KazotskyAlt
|
||||
beatLength: 2
|
||||
- stateName: KazotskyAltToNormal
|
||||
beatLength: 2
|
||||
poseStateOdd: KazotskyPose
|
||||
|
|
|
@ -42,7 +42,7 @@ namespace HeavenStudio.StudioDance
|
|||
totalChoreographyLength += step.beatLength;
|
||||
}
|
||||
|
||||
if (!cond.isPlaying)
|
||||
if (cond is not null && animator is not null && !cond.isPlaying)
|
||||
{
|
||||
animator.Play(currentChoreography.introState);
|
||||
}
|
||||
|
@ -67,6 +67,18 @@ namespace HeavenStudio.StudioDance
|
|||
animator.Play(currentChoreography.introState);
|
||||
}
|
||||
|
||||
public void SetStartChoreography()
|
||||
{
|
||||
if (debugChoreography != null)
|
||||
{
|
||||
SetChoreography(debugChoreography);
|
||||
}
|
||||
else
|
||||
{
|
||||
SetChoreography(0);
|
||||
}
|
||||
}
|
||||
|
||||
private void OnBeatPulse(double beat)
|
||||
{
|
||||
currentBeat = beat;
|
||||
|
|
|
@ -18,18 +18,20 @@ namespace HeavenStudio.StudioDance
|
|||
{
|
||||
windowBase.SetActive(true);
|
||||
content.SetActive(true);
|
||||
dancer.SetStartChoreography();
|
||||
|
||||
dropdown.ClearOptions();
|
||||
int startIdx = 0;
|
||||
int i = 0;
|
||||
foreach (ChoreographyInfo choreography in dancer.ChoreographyInfos)
|
||||
{
|
||||
dropdown.options.Add(new TMP_Dropdown.OptionData(choreography.choreographyName));
|
||||
if (choreography == dancer.CurrentChoreography)
|
||||
{
|
||||
dropdown.value = startIdx;
|
||||
dropdown.value = i;
|
||||
}
|
||||
startIdx++;
|
||||
i++;
|
||||
}
|
||||
dropdown.RefreshShownValue();
|
||||
}
|
||||
|
||||
public void CloseDanceWindow()
|
||||
|
|
|
@ -132,16 +132,6 @@ namespace HeavenStudio
|
|||
{
|
||||
Debug.LogWarning("Game loader RvlBookLoader failed!");
|
||||
}
|
||||
|
||||
game = NtrFreezeFrameLoader.AddGame(eventCaller);
|
||||
if (game != null)
|
||||
{
|
||||
eventCaller.minigames.Add(game.name, game);
|
||||
}
|
||||
else
|
||||
{
|
||||
Debug.LogWarning("Game loader NtrCameraManLoader failed!");
|
||||
}
|
||||
|
||||
game = AgbClapLoader.AddGame(eventCaller);
|
||||
if (game != null)
|
||||
|
|
|
@ -226,5 +226,73 @@ MonoBehaviour:
|
|||
- Assets/Scripts/LevelEditor/EventSelector/PropertyPrefabs/NumberPropertyPrefab.cs
|
||||
- Assets/Scripts/Games/NailCarpenter/Nail.cs
|
||||
- Assets/Scripts/Games/NailCarpenter/Sweet.cs
|
||||
- Assets/Scripts/Games/CatchOfTheDay/LakeScene.cs
|
||||
- Assets/Scripts/Games/Cannery/Cannery.cs
|
||||
- Assets/Scripts/Games/AirRally/AirRally.cs
|
||||
- Assets/Scripts/Games/SneakySpirits/SneakySpirits.cs
|
||||
- Assets/Scripts/Games/PajamaParty/PajamaParty.cs
|
||||
- Assets/Scripts/Games/ClapTrap/ClapTrap.cs
|
||||
- Assets/Scripts/Games/Manzai/Manzai.cs
|
||||
- Assets/Scripts/Games/MonkeyWatch/MonkeyWatch.cs
|
||||
- Assets/Scripts/Games/RhythmTweezers/RhythmTweezers.cs
|
||||
- Assets/Scripts/Games/SamuraiSliceNtr/SamuraiSliceNtr.cs
|
||||
- Assets/Scripts/Games/FanClub/FanClub.cs
|
||||
- Assets/Scripts/Games/LumBEARjack/LumBEARjack.cs
|
||||
- Assets/Scripts/Games/Lockstep/Lockstep.cs
|
||||
- Assets/Scripts/Games/QuizShow/QuizShow.cs
|
||||
- Assets/Scripts/Games/MunchyMonk/MunchyMonk.cs
|
||||
- Assets/Scripts/Games/NightWalkAgb/AgbNightWalk.cs
|
||||
- Assets/Scripts/Games/DJSchool/DJSchool.cs
|
||||
- Assets/Scripts/Games/BlueBear/BlueBear.cs
|
||||
- Assets/Scripts/Games/SeeSaw/SeeSaw.cs
|
||||
- Assets/Scripts/Games/CatchOfTheDay/BGFish.cs
|
||||
- Assets/Scripts/Games/Splashdown/Splashdown.cs
|
||||
- Assets/Scripts/Games/SumoBrothers/SumoBrothers.cs
|
||||
- Assets/Scripts/Games/TapTrial/TapTrial.cs
|
||||
- Assets/Scripts/Games/CheerReaders/CheerReaders.cs
|
||||
- Assets/Scripts/Games/WorkingDough/WorkingDough.cs
|
||||
- Assets/Scripts/Games/ChargingChicken/ChargingChicken.cs
|
||||
- Assets/Scripts/Games/ChargingChicken/Island.cs
|
||||
- Assets/Scripts/Games/MannequinFactory/MannequinFactory.cs
|
||||
- Assets/Scripts/Games/MarchingOrders/MarchingOrders.cs
|
||||
- Assets/Scripts/Games/RhythmTestGBA/RhythmTestGBA.cs
|
||||
- Assets/Scripts/Games/DoubleDate/DoubleDate.cs
|
||||
- Assets/Scripts/Games/TossBoys/TossBoys.cs
|
||||
- Assets/Scripts/Games/CropStomp/CropStomp.cs
|
||||
- Assets/Scripts/Games/RhythmRally/RhythmRally.cs
|
||||
- Assets/Scripts/Games/CatchOfTheDay/CatchOfTheDay.cs
|
||||
- Assets/Scripts/Games/TapTroupe/TapTroupe.cs
|
||||
- Assets/Scripts/LevelEditor/EventSelector/GridGameSelector.cs
|
||||
- Assets/Scripts/Util/MultiSound.cs
|
||||
- Assets/Scripts/Games/Tambourine/Tambourine.cs
|
||||
- Assets/Scripts/Games/SpaceDance/SpaceDance.cs
|
||||
- Assets/Scripts/Games/TrickClass/TrickClass.cs
|
||||
- Assets/Scripts/Games/MrUpbeat/MrUpbeat.cs
|
||||
- Assets/Scripts/Games/Ringside/Ringside.cs
|
||||
- Assets/Scripts/Games/CatchyTune/CatchyTune.cs
|
||||
- Assets/Scripts/Games/ForkLifter/ForkLifter.cs
|
||||
- Assets/Scripts/Games/RhythmSomen/RhythmSomen.cs
|
||||
- Assets/Scripts/Games/WizardsWaltz/WizardsWaltz.cs
|
||||
- Assets/Scripts/Games/CoinToss/CoinToss.cs
|
||||
- Assets/Scripts/Games/DrummingPractice/DrummingPractice.cs
|
||||
- Assets/Scripts/EventCaller.cs
|
||||
- Assets/Scripts/Games/TheDazzles/TheDazzles.cs
|
||||
- Assets/Scripts/Games/Kitties/Kitties.cs
|
||||
- Assets/Scripts/Games/FirstContact/FirstContact.cs
|
||||
- Assets/Scripts/Games/BoardMeeting/BoardMeeting.cs
|
||||
- Assets/Scripts/Games/OctopusMachine/OctopusMachine.cs
|
||||
- Assets/Scripts/Games/Tunnel/Tunnel.cs
|
||||
- Assets/Scripts/Games/Fireworks/Fireworks.cs
|
||||
- Assets/Scripts/Games/KarateMan/KarateMan.cs
|
||||
- Assets/Scripts/Games/ClappyTrio/ClappyTrio.cs
|
||||
- Assets/Scripts/Games/FlipperFlop/FlipperFlop.cs
|
||||
- Assets/Scripts/Games/Spaceball/Spaceball.cs
|
||||
- Assets/Scripts/Games/SlotMonster/SlotMonster.cs
|
||||
- Assets/Scripts/Games/TramAndPauline/TramAndPauline.cs
|
||||
- Assets/Scripts/Games/SpaceSoccer/SpaceSoccer.cs
|
||||
- Assets/Scripts/Games/TotemClimb/TotemClimb.cs
|
||||
- Assets/Scripts/Games/MeatGrinder/MeatGrinder.cs
|
||||
- Assets/Scripts/StudioDance/StudioDanceManager.cs
|
||||
- Assets/Scripts/StudioDance/Dancer.cs
|
||||
PathsToSkipImportEvent: []
|
||||
PathsToIgnoreOverwriteSettingOnAttribute: []
|
||||
|
|
Loading…
Reference in a new issue