Rockers and tweezers patch (#448)

* Rockers - Can now pitch down samples and bends, bends also correctly pitch to playback speed now.

* No peeking anim adjustment

* Added new no peeking signs
This commit is contained in:
Rapandrasmus 2023-06-03 16:51:30 +02:00 committed by GitHub
parent 967a4e313c
commit cc787c5f36
86 changed files with 405 additions and 290 deletions

View file

@ -2313,7 +2313,7 @@ MonoBehaviour:
hairBase: {fileID: 4104508031135416673}
longHairBase: {fileID: 2904820922900361117}
pluckedHairBase: {fileID: 184971667096376006}
noPeeking: {fileID: 4042312405385502527}
noPeekingRef: {fileID: 3878030345257055540}
HairsHolder: {fileID: 2002856028339003249}
DroppedHairsHolder: {fileID: 5787274807233818894}
pluckedHairSprite: {fileID: 3562159510210354730, guid: 8b24cfccb5b27054bbfccc7d7a912b73, type: 3}
@ -2532,13 +2532,14 @@ GameObject:
- component: {fileID: 5084500039877720310}
- component: {fileID: 738095676056161706}
- component: {fileID: 4042312405385502527}
- component: {fileID: 3878030345257055540}
m_Layer: 0
m_Name: noPeek_2
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!4 &5084500039877720310
Transform:
m_ObjectHideFlags: 0
@ -2627,6 +2628,21 @@ Animator:
m_AllowConstantClipSamplingOptimization: 1
m_KeepAnimatorStateOnDisable: 0
m_WriteDefaultValuesOnDisable: 0
--- !u!114 &3878030345257055540
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7224876636347965409}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 2c173ef5dba9631449b99fcbc50ff9e8, type: 3}
m_Name:
m_EditorClassIdentifier:
noPeekFullSprite: {fileID: 7840551089617349417, guid: 8b24cfccb5b27054bbfccc7d7a912b73, type: 3}
noPeekHalfLeftSprite: {fileID: 5276483324951909424, guid: 8b24cfccb5b27054bbfccc7d7a912b73, type: 3}
noPeekHalfRightSprite: {fileID: -6168475699144272206, guid: 8b24cfccb5b27054bbfccc7d7a912b73, type: 3}
--- !u!1 &7665197146870558127
GameObject:
m_ObjectHideFlags: 0

View file

@ -20,8 +20,8 @@ AnimationClip:
m_Curve:
- serializedVersion: 3
time: 0
value: {x: 0, y: -4.12, z: 0}
inSlope: {x: 0, y: 0, z: 0}
value: {x: 0, y: -4.55, z: 0}
inSlope: {x: -0, y: 52.92, z: -0}
outSlope: {x: 0, y: 0, z: 0}
tangentMode: 0
weightedMode: 0
@ -30,7 +30,7 @@ AnimationClip:
- serializedVersion: 3
time: 0.16666667
value: {x: 0, y: -13.37, z: 0}
inSlope: {x: -0, y: -55.5, z: -0}
inSlope: {x: -0, y: -52.92, z: -0}
outSlope: {x: 0, y: 0, z: 0}
tangentMode: 0
weightedMode: 0
@ -85,7 +85,7 @@ AnimationClip:
- serializedVersion: 3
time: 0
value: 0
inSlope: 0
inSlope: -0
outSlope: 0
tangentMode: 5
weightedMode: 0
@ -112,8 +112,8 @@ AnimationClip:
m_Curve:
- serializedVersion: 3
time: 0
value: -4.12
inSlope: 0
value: -4.55
inSlope: 52.92
outSlope: 0
tangentMode: 5
weightedMode: 0
@ -122,7 +122,7 @@ AnimationClip:
- serializedVersion: 3
time: 0.16666667
value: -13.37
inSlope: -55.5
inSlope: -52.92
outSlope: 0
tangentMode: 5
weightedMode: 0
@ -141,7 +141,7 @@ AnimationClip:
- serializedVersion: 3
time: 0
value: 0
inSlope: 0
inSlope: -0
outSlope: 0
tangentMode: 5
weightedMode: 0

View file

@ -29,8 +29,8 @@ AnimationClip:
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
- serializedVersion: 3
time: 0.16666667
value: {x: 0, y: -4.12, z: 0}
inSlope: {x: -0, y: 55.5, z: -0}
value: {x: 0, y: -4.55, z: 0}
inSlope: {x: -0, y: 52.92, z: -0}
outSlope: {x: 0, y: 0, z: 0}
tangentMode: 0
weightedMode: 0
@ -121,8 +121,8 @@ AnimationClip:
outWeight: 0.33333334
- serializedVersion: 3
time: 0.16666667
value: -4.12
inSlope: 55.5
value: -4.55
inSlope: 52.92
outSlope: 0
tangentMode: 5
weightedMode: 0

View file

@ -973,8 +973,8 @@ TextureImporter:
y: 8
width: 848
height: 1456
alignment: 0
pivot: {x: 0.5, y: 0.5}
alignment: 9
pivot: {x: 0.017474094, y: 0.36694112}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
@ -994,8 +994,8 @@ TextureImporter:
y: 8
width: 1040
height: 1456
alignment: 0
pivot: {x: 0.5, y: 0.5}
alignment: 9
pivot: {x: 0.94172, y: 0.33699724}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []

View file

@ -114,6 +114,10 @@ namespace HeavenStudio.Games
/// <param name="length">The length of the interval.</param>
public void StartInterval(float beat, float length)
{
if (!IntervalIsActive())
{
if (queuedEvents.Count > 0) queuedEvents.Clear();
}
intervalStartBeat = beat;
intervalLength = length;
defaultIntervalLength = length;

View file

@ -0,0 +1,57 @@
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
using HeavenStudio.Util;
namespace HeavenStudio.Games.Scripts_RhythmTweezers
{
public class NoPeekingSign : MonoBehaviour
{
private float peekBeat = -1;
private bool peekRising;
private bool shouldDelete;
private Animator anim;
private SpriteRenderer sr;
[SerializeField] private Sprite noPeekFullSprite;
[SerializeField] private Sprite noPeekHalfLeftSprite;
[SerializeField] private Sprite noPeekHalfRightSprite;
private void Awake()
{
anim = GetComponent<Animator>();
sr = GetComponent<SpriteRenderer>();
}
public void Init(float beat, float length, int type)
{
peekBeat = beat - 1;
peekRising = true;
BeatAction.New(gameObject, new List<BeatAction.Action>()
{
new BeatAction.Action(beat + length, delegate { peekBeat = beat + length; peekRising = false; shouldDelete = true; })
});
sr.sprite = type switch
{
(int)RhythmTweezers.NoPeekSignType.Full => noPeekFullSprite,
(int)RhythmTweezers.NoPeekSignType.HalfLeft => noPeekHalfLeftSprite,
(int)RhythmTweezers.NoPeekSignType.HalfRight => noPeekHalfRightSprite,
_ => throw new System.NotImplementedException(),
};
}
public void Update()
{
float normalizedBeat = Conductor.instance.GetPositionFromBeat(peekBeat, 1);
if (normalizedBeat >= 0f && normalizedBeat <= 1f)
{
anim.DoNormalizedAnimation(peekRising ? "NoPeekRise" : "NoPeekLower", normalizedBeat);
}
if (normalizedBeat > 1f && !peekRising && shouldDelete)
{
Destroy(gameObject);
}
}
}
}

View file

@ -0,0 +1,11 @@
fileFormatVersion: 2
guid: 2c173ef5dba9631449b99fcbc50ff9e8
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

View file

@ -61,9 +61,13 @@ namespace HeavenStudio.Games.Loaders
},
new GameAction("noPeek", "No Peeking Sign")
{
preFunction = delegate { var e = eventCaller.currentEntity; RhythmTweezers.PreNoPeeking(e.beat, e.length); },
preFunction = delegate { var e = eventCaller.currentEntity; RhythmTweezers.PreNoPeeking(e.beat, e.length, e["type"]); },
defaultLength = 4f,
resizable = true
resizable = true,
parameters = new List<Param>()
{
new Param("type", RhythmTweezers.NoPeekSignType.Full, "Sign Type", "Which sign will be used?")
}
},
new GameAction("fade background color", "Background Fade")
{
@ -139,10 +143,18 @@ namespace HeavenStudio.Games
Potato
}
public enum NoPeekSignType
{
Full,
HalfRight,
HalfLeft
}
private struct QueuedPeek
{
public float beat;
public float length;
public int type;
}
[Header("References")]
@ -155,7 +167,7 @@ namespace HeavenStudio.Games
public GameObject hairBase;
public GameObject longHairBase;
public GameObject pluckedHairBase;
[SerializeField] private Animator noPeeking;
[SerializeField] NoPeekingSign noPeekingRef;
public GameObject HairsHolder;
public GameObject DroppedHairsHolder;
@ -216,9 +228,6 @@ namespace HeavenStudio.Games
private static List<float> passedTurns = new List<float>();
private float peekBeat = -1;
private bool peekRising;
private void Awake()
{
instance = this;
@ -443,30 +452,28 @@ namespace HeavenStudio.Games
ChangeBackgroundColor(end, beats);
}
public static void PreNoPeeking(float beat, float length)
public static void PreNoPeeking(float beat, float length, int type)
{
if (GameManager.instance.currentGame == "rhythmTweezers")
{
instance.NoPeeking(beat, length);
instance.NoPeeking(beat, length, type);
}
else
{
queuedPeeks.Add(new QueuedPeek()
{
beat = beat,
length = length
length = length,
type = type
});
}
}
public void NoPeeking(float beat, float length)
public void NoPeeking(float beat, float length, int type)
{
peekBeat = beat - 1f;
peekRising = true;
BeatAction.New(instance.gameObject, new List<BeatAction.Action>()
{
new BeatAction.Action(beat + length, delegate { peekBeat = beat + length; peekRising = false; })
});
NoPeekingSign spawnedNoPeekingSign = Instantiate(noPeekingRef, transform);
spawnedNoPeekingSign.gameObject.SetActive(true);
spawnedNoPeekingSign.Init(beat, length, type);
}
private void Update()
@ -485,15 +492,10 @@ namespace HeavenStudio.Games
{
foreach (var peek in queuedPeeks)
{
NoPeeking(peek.beat, peek.length);
NoPeeking(peek.beat, peek.length, peek.type);
}
queuedPeeks.Clear();
}
float normalizedBeat = Conductor.instance.GetPositionFromBeat(peekBeat, 1);
if (normalizedBeat >= 0f && normalizedBeat <= 1f)
{
noPeeking.DoNormalizedAnimation(peekRising ? "NoPeekRise" : "NoPeekLower", normalizedBeat);
}
}
}

View file

@ -56,7 +56,7 @@ namespace HeavenStudio.Games.Loaders
new Param("5JJ", new EntityTypes.Integer(-1, 24, 0), "B3 String (JJ)", "How many semitones up is this string pitched? If left at -1, this string will not play."),
new Param("6JJ", new EntityTypes.Integer(-1, 24, 0), "E4 String (JJ)", "How many semitones up is this string pitched? If left at -1, this string will not play."),
new Param("sampleJJ", Rockers.PremadeSamples.None, "Premade Sample (JJ)", "Use a premade sample?"),
new Param("pitchSampleJJ", new EntityTypes.Integer(0, 24, 0), "Sample Semtiones (JJ)", "Pitch up the sample by X amount of semitones?"),
new Param("pitchSampleJJ", new EntityTypes.Integer(-24, 24, 0), "Sample Semtiones (JJ)", "Pitch up the sample by X amount of semitones?"),
new Param("gcJJ", false, "Glee Club Guitar (JJ)", "Will JJ use the same guitar as in the glee club lessons?"),
new Param("1S", new EntityTypes.Integer(-1, 24, 0), "E2 String (Soshi)", "How many semitones up is this string pitched? If left at -1, this string will not play."),
new Param("2S", new EntityTypes.Integer(-1, 24, 0), "A2 String (Soshi)", "How many semitones up is this string pitched? If left at -1, this string will not play."),
@ -65,7 +65,7 @@ namespace HeavenStudio.Games.Loaders
new Param("5S", new EntityTypes.Integer(-1, 24, 0), "B3 String (Soshi)", "How many semitones up is this string pitched? If left at -1, this string will not play."),
new Param("6S", new EntityTypes.Integer(-1, 24, 0), "E4 String (Soshi)", "How many semitones up is this string pitched? If left at -1, this string will not play."),
new Param("sampleS", Rockers.PremadeSamples.None, "Premade Sample (Soshi)", "Use a premade sample?"),
new Param("pitchSampleS", new EntityTypes.Integer(0, 24, 0), "Sample Semtiones (Soshi)", "Pitch up the sample by X amount of semitones?"),
new Param("pitchSampleS", new EntityTypes.Integer(-24, 24, 0), "Sample Semtiones (Soshi)", "Pitch up the sample by X amount of semitones?"),
new Param("gcS", false, "Glee Club Guitar (Soshi)", "Will Soshi use the same guitar as in the glee club lessons?")
},
inactiveFunction = delegate { var e = eventCaller.currentEntity; Rockers.InactiveRiff(e.beat, e.length, new int[6]
@ -86,8 +86,8 @@ namespace HeavenStudio.Games.Loaders
parameters = new List<Param>()
{
new Param("respond", true, "Respond", "Will this guitar bend have to be responded to?"),
new Param("1JJ", new EntityTypes.Integer(1, 24, 1), "Pitch Bend (JJ)", "How many semitones up is the current riff gonna be pitchbended?"),
new Param("1S", new EntityTypes.Integer(1, 24, 1), "Pitch Bend (Soshi)", "How many semitones up is the current riff gonna be pitchbended?"),
new Param("1JJ", new EntityTypes.Integer(-24, 24, 1), "Pitch Bend (JJ)", "How many semitones up is the current riff gonna be pitchbended?"),
new Param("1S", new EntityTypes.Integer(-24, 24, 1), "Pitch Bend (Soshi)", "How many semitones up is the current riff gonna be pitchbended?"),
},
inactiveFunction = delegate { var e = eventCaller.currentEntity; Rockers.InactiveBend(e.beat, e.length, e["1S"]); }
},
@ -100,6 +100,15 @@ namespace HeavenStudio.Games.Loaders
new Param("who", Rockers.WhoMutes.JJ, "Who?", "Who will prepare? (Soshi is only affected by this event in auto-play.)")
}
},
new GameAction("unPrepare", "Unprepare")
{
function = delegate { Rockers.instance.UnMute(eventCaller.currentEntity["who"]); },
defaultLength = 0.5f,
parameters = new List<Param>()
{
new Param("who", Rockers.WhoMutes.JJ, "Who?", "Who will unprepare? (Soshi is only affected by this event in auto-play.)")
}
},
new GameAction("passTurn", "Pass Turn")
{
function = delegate { var e = eventCaller.currentEntity; Rockers.instance.PassTurn(e.beat, e.length, e["moveCamera"]); },
@ -142,21 +151,21 @@ namespace HeavenStudio.Games.Loaders
{
new Param("moveCamera", true, "Move Camera", "Should the camera move?"),
new Param("JJ1", Rockers.PremadeSamples.ChordG5, "Premade Sample 1 (JJ)", "What sample to use for the 1st riff?"),
new Param("pJJ1", new EntityTypes.Integer(0, 24, 0), "Sample Semtiones 1 (JJ)", "Pitch up the sample by X amount of semitones?"),
new Param("pJJ1", new EntityTypes.Integer(-24, 24, 0), "Sample Semtiones 1 (JJ)", "Pitch up the sample by X amount of semitones?"),
new Param("JJ2", Rockers.PremadeSamples.ChordG5, "Premade Sample 2 (JJ)", "What sample to use for the 2nd riff?"),
new Param("pJJ2", new EntityTypes.Integer(0, 24, 0), "Sample Semtiones 2 (JJ)", "Pitch up the sample by X amount of semitones?"),
new Param("pJJ2", new EntityTypes.Integer(-24, 24, 0), "Sample Semtiones 2 (JJ)", "Pitch up the sample by X amount of semitones?"),
new Param("JJ3", Rockers.PremadeSamples.ChordG5, "Premade Sample 3 (JJ)", "What sample to use for the 3rd riff?"),
new Param("pJJ3", new EntityTypes.Integer(0, 24, 0), "Sample Semtiones 3 (JJ)", "Pitch up the sample by X amount of semitones?"),
new Param("pJJ3", new EntityTypes.Integer(-24, 24, 0), "Sample Semtiones 3 (JJ)", "Pitch up the sample by X amount of semitones?"),
new Param("JJ4", Rockers.PremadeSamples.ChordA, "Premade Sample 4 (JJ)", "What sample to use for the final riff?"),
new Param("pJJ4", new EntityTypes.Integer(0, 24, 0), "Sample Semtiones 4 (JJ)", "Pitch up the sample by X amount of semitones?"),
new Param("pJJ4", new EntityTypes.Integer(-24, 24, 0), "Sample Semtiones 4 (JJ)", "Pitch up the sample by X amount of semitones?"),
new Param("S1", Rockers.PremadeSamples.ChordG, "Premade Sample 1 (Soshi)", "What sample to use for the 1st riff?"),
new Param("pS1", new EntityTypes.Integer(0, 24, 0), "Sample Semtiones 1 (Soshi)", "Pitch up the sample by X amount of semitones?"),
new Param("pS1", new EntityTypes.Integer(-24, 24, 0), "Sample Semtiones 1 (Soshi)", "Pitch up the sample by X amount of semitones?"),
new Param("S2", Rockers.PremadeSamples.ChordG, "Premade Sample 2 (Soshi)", "What sample to use for the 2nd riff?"),
new Param("pS2", new EntityTypes.Integer(0, 24, 0), "Sample Semtiones 2 (Soshi)", "Pitch up the sample by X amount of semitones?"),
new Param("pS2", new EntityTypes.Integer(-24, 24, 0), "Sample Semtiones 2 (Soshi)", "Pitch up the sample by X amount of semitones?"),
new Param("S3", Rockers.PremadeSamples.ChordG, "Premade Sample 3 (Soshi)", "What sample to use for the 3rd riff?"),
new Param("pS3", new EntityTypes.Integer(0, 24, 0), "Sample Semtiones 3 (Soshi)", "Pitch up the sample by X amount of semitones?"),
new Param("pS3", new EntityTypes.Integer(-24, 24, 0), "Sample Semtiones 3 (Soshi)", "Pitch up the sample by X amount of semitones?"),
new Param("S4", Rockers.PremadeSamples.ChordA, "Premade Sample 4 (Soshi)", "What sample to use for the final riff?"),
new Param("pS4", new EntityTypes.Integer(0, 24, 0), "Sample Semtiones 4 (Soshi)", "Pitch up the sample by X amount of semitones?"),
new Param("pS4", new EntityTypes.Integer(-24, 24, 0), "Sample Semtiones 4 (Soshi)", "Pitch up the sample by X amount of semitones?"),
}
},
new GameAction("lastOne", "Last One!")
@ -188,17 +197,17 @@ namespace HeavenStudio.Games.Loaders
{
new Param("moveCamera", true, "Move Camera", "Should the camera move?"),
new Param("JJ1", Rockers.PremadeSamples.ChordAsus4, "Premade Sample 1 (JJ)", "What sample to use for the 1st riff?"),
new Param("pJJ1", new EntityTypes.Integer(0, 24, 0), "Sample Semtiones 1 (JJ)", "Pitch up the sample by X amount of semitones?"),
new Param("pJJ1", new EntityTypes.Integer(-24, 24, 0), "Sample Semtiones 1 (JJ)", "Pitch up the sample by X amount of semitones?"),
new Param("JJ2", Rockers.PremadeSamples.ChordAsus4, "Premade Sample 2 (JJ)", "What sample to use for the 2nd riff?"),
new Param("pJJ2", new EntityTypes.Integer(0, 24, 0), "Sample Semtiones 2 (JJ)", "Pitch up the sample by X amount of semitones?"),
new Param("pJJ2", new EntityTypes.Integer(-24, 24, 0), "Sample Semtiones 2 (JJ)", "Pitch up the sample by X amount of semitones?"),
new Param("JJ3", Rockers.PremadeSamples.ChordAsus4, "Premade Sample 3 (JJ)", "What sample to use for the final riff?"),
new Param("pJJ3", new EntityTypes.Integer(0, 24, 0), "Sample Semtiones 3 (JJ)", "Pitch up the sample by X amount of semitones?"),
new Param("pJJ3", new EntityTypes.Integer(-24, 24, 0), "Sample Semtiones 3 (JJ)", "Pitch up the sample by X amount of semitones?"),
new Param("S1", Rockers.PremadeSamples.ChordDmaj9, "Premade Sample 1 (Soshi)", "What sample to use for the 1st riff?"),
new Param("pS1", new EntityTypes.Integer(0, 24, 0), "Sample Semtiones 1 (Soshi)", "Pitch up the sample by X amount of semitones?"),
new Param("pS1", new EntityTypes.Integer(-24, 24, 0), "Sample Semtiones 1 (Soshi)", "Pitch up the sample by X amount of semitones?"),
new Param("S2", Rockers.PremadeSamples.ChordDmaj9, "Premade Sample 2 (Soshi)", "What sample to use for the 2nd riff?"),
new Param("pS2", new EntityTypes.Integer(0, 24, 0), "Sample Semtiones 2 (Soshi)", "Pitch up the sample by X amount of semitones?"),
new Param("pS2", new EntityTypes.Integer(-24, 24, 0), "Sample Semtiones 2 (Soshi)", "Pitch up the sample by X amount of semitones?"),
new Param("S3", Rockers.PremadeSamples.ChordDmaj9, "Premade Sample 3 (Soshi)", "What sample to use for the final riff?"),
new Param("pS3", new EntityTypes.Integer(0, 24, 0), "Sample Semtiones 3 (Soshi)", "Pitch up the sample by X amount of semitones?"),
new Param("pS3", new EntityTypes.Integer(-24, 24, 0), "Sample Semtiones 3 (Soshi)", "Pitch up the sample by X amount of semitones?"),
}
},
new GameAction("count", "Count In")
@ -263,7 +272,7 @@ namespace HeavenStudio.Games.Loaders
new Param("5JJ", new EntityTypes.Integer(-1, 24, 0), "B3 String (JJ)", "How many semitones up is this string pitched? If left at -1, this string will not play."),
new Param("6JJ", new EntityTypes.Integer(-1, 24, 0), "E4 String (JJ)", "How many semitones up is this string pitched? If left at -1, this string will not play."),
new Param("sampleJJ", Rockers.PremadeSamples.None, "Premade Sample (JJ)", "Use a premade sample?"),
new Param("pitchSampleJJ", new EntityTypes.Integer(0, 24, 0), "Sample Semtiones (JJ)", "Pitch up the sample by X amount of semitones?"),
new Param("pitchSampleJJ", new EntityTypes.Integer(-24, 24, 0), "Sample Semtiones (JJ)", "Pitch up the sample by X amount of semitones?"),
new Param("gcJJ", false, "Glee Club Guitar (JJ)", "Will JJ use the same guitar as in the glee club lessons?"),
new Param("1S", new EntityTypes.Integer(-1, 24, 0), "E2 String (Soshi)", "How many semitones up is this string pitched? If left at -1, this string will not play."),
new Param("2S", new EntityTypes.Integer(-1, 24, 0), "A2 String (Soshi)", "How many semitones up is this string pitched? If left at -1, this string will not play."),
@ -272,7 +281,7 @@ namespace HeavenStudio.Games.Loaders
new Param("5S", new EntityTypes.Integer(-1, 24, 0), "B3 String (Soshi)", "How many semitones up is this string pitched? If left at -1, this string will not play."),
new Param("6S", new EntityTypes.Integer(-1, 24, 0), "E4 String (Soshi)", "How many semitones up is this string pitched? If left at -1, this string will not play."),
new Param("sampleS", Rockers.PremadeSamples.None, "Premade Sample (Soshi)", "Use a premade sample?"),
new Param("pitchSampleS", new EntityTypes.Integer(0, 24, 0), "Sample Semtiones (Soshi)", "Pitch up the sample by X amount of semitones?"),
new Param("pitchSampleS", new EntityTypes.Integer(-24, 24, 0), "Sample Semtiones (Soshi)", "Pitch up the sample by X amount of semitones?"),
new Param("gcS", false, "Glee Club Guitar (Soshi)", "Will Soshi use the same guitar as in the glee club lessons?")
}
},
@ -288,7 +297,7 @@ namespace HeavenStudio.Games.Loaders
new Param("5JJ", new EntityTypes.Integer(-1, 24, 0), "B3 String (JJ)", "How many semitones up is this string pitched? If left at -1, this string will not play."),
new Param("6JJ", new EntityTypes.Integer(-1, 24, 0), "E4 String (JJ)", "How many semitones up is this string pitched? If left at -1, this string will not play."),
new Param("sampleJJ", Rockers.PremadeSamples.None, "Premade Sample (JJ)", "Use a premade sample?"),
new Param("pitchSampleJJ", new EntityTypes.Integer(0, 24, 0), "Sample Semtiones (JJ)", "Pitch up the sample by X amount of semitones?"),
new Param("pitchSampleJJ", new EntityTypes.Integer(-24, 24, 0), "Sample Semtiones (JJ)", "Pitch up the sample by X amount of semitones?"),
new Param("gcJJ", false, "Glee Club Guitar (JJ)", "Will JJ use the same guitar as in the glee club lessons?"),
new Param("1S", new EntityTypes.Integer(-1, 24, 0), "E2 String (Soshi)", "How many semitones up is this string pitched? If left at -1, this string will not play."),
new Param("2S", new EntityTypes.Integer(-1, 24, 0), "A2 String (Soshi)", "How many semitones up is this string pitched? If left at -1, this string will not play."),
@ -297,7 +306,7 @@ namespace HeavenStudio.Games.Loaders
new Param("5S", new EntityTypes.Integer(-1, 24, 0), "B3 String (Soshi)", "How many semitones up is this string pitched? If left at -1, this string will not play."),
new Param("6S", new EntityTypes.Integer(-1, 24, 0), "E4 String (Soshi)", "How many semitones up is this string pitched? If left at -1, this string will not play."),
new Param("sampleS", Rockers.PremadeSamples.None, "Premade Sample (Soshi)", "Use a premade sample?"),
new Param("pitchSampleS", new EntityTypes.Integer(0, 24, 0), "Sample Semtiones (Soshi)", "Pitch up the sample by X amount of semitones?"),
new Param("pitchSampleS", new EntityTypes.Integer(-24, 24, 0), "Sample Semtiones (Soshi)", "Pitch up the sample by X amount of semitones?"),
new Param("gcS", false, "Glee Club Guitar (Soshi)", "Will Soshi use the same guitar as in the glee club lessons?")
}
},
@ -945,6 +954,18 @@ namespace HeavenStudio.Games
}
}
public void UnMute(int whoMutes)
{
if (whoMutes is (int)WhoMutes.JJ or (int)WhoMutes.Both)
{
JJ.UnHold(true);
}
if (whoMutes is (int)WhoMutes.Soshi or (int)WhoMutes.Both)
{
if (GameManager.instance.autoplay) Soshi.UnHold(true);
}
}
public void PassTurn(float beat, float length, bool moveCamera)
{
if (crHandlerInstance.queuedEvents.Count > 0)

View file

@ -101,6 +101,7 @@ namespace HeavenStudio.Games.Scripts_Rockers
public void StrumStrings(bool gleeClub, int[] pitches, Rockers.PremadeSamples sample, int sampleTones, bool disableStrumEffect = false, bool jump = false, bool barely = false)
{
if (strumming) return;
muted = false;
strumming = true;
StopSounds();
@ -209,7 +210,7 @@ namespace HeavenStudio.Games.Scripts_Rockers
lastBendPitch = pitch;
if (chordSound != null)
{
chordSound.BendUp(0.05f, Jukebox.GetPitchFromSemiTones(Jukebox.GetSemitonesFromPitch(chordSound.pitch) + pitch, true));
chordSound.BendUp(0.05f, Jukebox.GetPitchFromSemiTones(Jukebox.GetSemitonesFromPitch(chordSound.pitch, true) + pitch, true));
}
else
{
@ -217,7 +218,7 @@ namespace HeavenStudio.Games.Scripts_Rockers
{
if (stringSounds[i] != null)
{
stringSounds[i].BendUp(0.05f, Jukebox.GetPitchFromSemiTones(Jukebox.GetSemitonesFromPitch(stringSounds[i].pitch) + pitch, true));
stringSounds[i].BendUp(0.05f, Jukebox.GetPitchFromSemiTones(Jukebox.GetSemitonesFromPitch(stringSounds[i].pitch, true) + pitch, true));
}
}
}
@ -275,9 +276,9 @@ namespace HeavenStudio.Games.Scripts_Rockers
muted = true;
}
public void UnHold()
public void UnHold(bool overrideMute = false)
{
if (!muted) return;
if (!muted && !overrideMute) return;
muted = false;
if (!together) DoScaledAnimationAsync("UnCrouch", 0.5f);
}

View file

@ -302,11 +302,12 @@ namespace HeavenStudio.Util
}
}
/// <summary>
/// Returns the semitones from a pitch. Does not work with pitches pitched to music.
/// Returns the semitones from a pitch.
/// </summary>
/// <param name="pitch">The pitch of the sound.</param>
public static int GetSemitonesFromPitch(float pitch)
public static int GetSemitonesFromPitch(float pitch, bool pitchToMusic)
{
if (pitchToMusic) return (int)((12f * Mathf.Log(pitch, 2)) / Conductor.instance.musicSource.pitch);
return (int)(12f * Mathf.Log(pitch, 2));
}

View file

@ -1,219 +1,219 @@
ManifestFileVersion: 0
CRC: 1027334792
CRC: 3324662219
AssetBundleManifest:
AssetBundleInfos:
Info_0:
Name: ctrpillow/common
Dependencies: {}
Info_1:
Name: ntrsamurai/common
Name: karate/common
Dependencies: {}
Info_2:
Name: rvlbooks/locale.en
Name: agbmarcher/common
Dependencies: {}
Info_3:
Name: agbmarcher/locale.jp
Dependencies: {}
Info_4:
Name: ntridol/common
Dependencies: {}
Info_5:
Name: ntrdj/common
Dependencies:
Dependency_0: rvldate/common
Info_4:
Name: ctrpillow/locale.en
Dependencies: {}
Info_5:
Name: ntrsamurai/common
Dependencies: {}
Info_6:
Name: ctrpillow/locale.jp
Name: ntridol/common
Dependencies: {}
Info_7:
Name: karate/common
Name: rvlbooks/locale.en
Dependencies: {}
Info_8:
Name: ctrcatchy/common
Name: ntridol/locale.jp
Dependencies: {}
Info_9:
Name: rvlbooks/common
Dependencies: {}
Info_10:
Name: agbmarcher/common
Name: ctrcatchy/common
Dependencies: {}
Info_11:
Name: ntridol/locale.jp
Dependencies: {}
Info_12:
Name: agbmarcher/locale.en
Dependencies: {}
Info_13:
Name: ctrpillow/locale.en
Dependencies: {}
Info_14:
Info_12:
Name: karate/locale.en
Dependencies: {}
Info_13:
Name: agbmarcher/locale.jp
Dependencies: {}
Info_14:
Name: ctrpillow/locale.ko
Dependencies: {}
Info_15:
Name: ntrcoin/common
Name: ctrpillow/locale.jp
Dependencies: {}
Info_16:
Name: ctrpillow/locale.ko
Name: ntrcoin/common
Dependencies: {}
Info_17:
Name: ntrsamurai/locale.en
Dependencies: {}
Info_18:
Name: ntrassembly/common
Name: ntrsoccer/common
Dependencies: {}
Info_19:
Name: rvlinterview/locale.en
Name: rvlfork/common
Dependencies: {}
Info_20:
Name: rvlseal/locale.en
Dependencies: {}
Info_21:
Name: agbtoss/common
Name: agbspacedance/locale.jp
Dependencies: {}
Info_22:
Name: rvlrotation/common
Name: rvlseal/common
Dependencies: {}
Info_23:
Name: rvlbadminton/locale.en
Dependencies: {}
Info_24:
Name: agbhair/common
Dependencies: {}
Info_25:
Name: agbclap/common
Dependencies: {}
Info_26:
Name: ctrinterpreter/common
Info_24:
Name: ntrshugyo/locale.en
Dependencies: {}
Info_27:
Name: ntrboxshow/common
Dependencies: {}
Info_28:
Name: agbexplode/common
Dependencies: {}
Info_29:
Name: rvllegs/common
Dependencies: {}
Info_30:
Name: agbquiz/common
Dependencies:
Dependency_0: karate/common
Info_31:
Name: agboffbeat/common
Dependencies: {}
Info_32:
Name: ntrpingpong/common
Dependencies: {}
Info_33:
Name: ntrcork/common
Dependencies: {}
Info_34:
Name: agbspacedance/common
Dependencies: {}
Info_35:
Name: ctrbear/common
Dependencies: {}
Info_36:
Name: ntrbackbeat/common
Dependencies: {}
Info_37:
Info_25:
Name: ntrninja/common
Dependencies: {}
Info_38:
Name: ntrsoccer/locale.en
Dependencies: {}
Info_39:
Name: ctrintro/common
Dependencies: {}
Info_40:
Name: rvlrocket/common
Dependencies: {}
Info_41:
Name: pcosomen/common
Dependencies: {}
Info_42:
Info_26:
Name: agbbatter/common
Dependencies:
Dependency_0: karate/common
Info_43:
Name: agbspacedance/locale.jp
Info_27:
Name: pcomeat/common
Dependencies: {}
Info_44:
Name: agbghost/common
Dependencies: {}
Info_45:
Name: ntrchorus/common
Dependencies: {}
Info_46:
Name: ctrteppan/common
Dependencies: {}
Info_47:
Info_28:
Name: rvldough/common
Dependencies: {}
Info_48:
Name: rvlseesaw/common
Info_29:
Name: rvlrocket/common
Dependencies: {}
Info_49:
Name: rvlfork/common
Info_30:
Name: ctrinterpreter/common
Dependencies: {}
Info_50:
Name: ntrtunnel/locale.en
Dependencies: {}
Info_51:
Name: rvlinterview/common
Dependencies: {}
Info_52:
Name: rvlseal/common
Dependencies: {}
Info_53:
Name: ntrshugyo/common
Dependencies: {}
Info_54:
Name: ntrstomp/common
Dependencies: {}
Info_55:
Name: rvlbadminton/common
Dependencies: {}
Info_56:
Name: ntrboxshow/locale.en
Dependencies: {}
Info_57:
Name: ntrsoccer/common
Dependencies: {}
Info_58:
Name: agbwizard/common
Dependencies: {}
Info_59:
Info_31:
Name: rvlseesaw/locale.en
Dependencies: {}
Info_60:
Name: rvldate/common
Dependencies:
Dependency_0: ntrdj/common
Info_61:
Info_32:
Name: rvlseesaw/common
Dependencies: {}
Info_33:
Name: agbwizard/common
Dependencies: {}
Info_34:
Name: rvldrum/common
Dependencies: {}
Info_35:
Name: agbtoss/common
Dependencies: {}
Info_36:
Name: rvlinterview/common
Dependencies: {}
Info_37:
Name: ntrbackbeat/common
Dependencies: {}
Info_38:
Name: rvlinterview/locale.en
Dependencies: {}
Info_39:
Name: agbexplode/common
Dependencies: {}
Info_40:
Name: rvlrotation/locale.en
Dependencies: {}
Info_41:
Name: ctrteppan/common
Dependencies: {}
Info_42:
Name: ctrbear/common
Dependencies: {}
Info_43:
Name: ntrboxshow/locale.en
Dependencies: {}
Info_44:
Name: agbhair/common
Dependencies: {}
Info_45:
Name: rvlbadminton/common
Dependencies: {}
Info_46:
Name: rvllegs/common
Dependencies: {}
Info_47:
Name: rvlbadminton/locale.en
Dependencies: {}
Info_48:
Name: agbtap/common
Dependencies:
Dependency_0: ntridol/common
Info_62:
Name: ntrshugyo/locale.en
Dependencies: {}
Info_63:
Name: rvldrum/common
Dependencies: {}
Info_64:
Info_49:
Name: ntrchorus/locale.en
Dependencies: {}
Info_65:
Info_50:
Name: agbspacedance/common
Dependencies: {}
Info_51:
Name: rvldate/common
Dependencies:
Dependency_0: ntrdj/common
Info_52:
Name: rvlrotation/common
Dependencies: {}
Info_53:
Name: ntrboxshow/common
Dependencies: {}
Info_54:
Name: ntrassembly/common
Dependencies: {}
Info_55:
Name: ntrpingpong/common
Dependencies: {}
Info_56:
Name: agbquiz/common
Dependencies:
Dependency_0: karate/common
Info_57:
Name: ctrintro/common
Dependencies: {}
Info_58:
Name: agboffbeat/common
Dependencies: {}
Info_59:
Name: mobtrick/common
Dependencies: {}
Info_66:
Name: pcomeat/common
Info_60:
Name: ntrcork/common
Dependencies: {}
Info_67:
Name: rvlrotation/locale.en
Info_61:
Name: ntrchorus/common
Dependencies: {}
Info_68:
Info_62:
Name: rvllegs/locale.en
Dependencies: {}
Info_69:
Info_63:
Name: ntrshugyo/common
Dependencies: {}
Info_64:
Name: pcosomen/common
Dependencies: {}
Info_65:
Name: ntrstomp/common
Dependencies: {}
Info_66:
Name: agbghost/common
Dependencies: {}
Info_67:
Name: ntrtunnel/locale.en
Dependencies: {}
Info_68:
Name: ntrtunnel/common
Dependencies: {}
Info_69:
Name: ntrsoccer/locale.en
Dependencies: {}

View file

@ -1,9 +1,9 @@
ManifestFileVersion: 0
CRC: 1387178105
CRC: 3559125235
Hashes:
AssetFileHash:
serializedVersion: 2
Hash: f6232133bc3c123d088efd0b61878f97
Hash: b7f85f77b7808e7620bb5adb51da46af
TypeTreeHash:
serializedVersion: 2
Hash: 3c21c7b04832853cd27601d2dee6bffc
@ -96,4 +96,4 @@ Assets:
- Assets/Resources/Sprites/Games/Spaceball/baseball.png
- Assets/Resources/Sprites/Games/Spaceball/Animations/Idle.anim
Dependencies:
- C:/Users/mathi/OneDrive/Documents/GitHub/HeavenStudio/Assets/StreamingAssets/karate/common
- C:/Users/rasmu/OneDrive/Dokumenter/GitHub/HeavenStudio/Assets/StreamingAssets/karate/common

View file

@ -3,7 +3,7 @@ CRC: 1380240849
Hashes:
AssetFileHash:
serializedVersion: 2
Hash: 7fab1d3cddedb82c63bdf5eafd177ede
Hash: 72a371fc0b53bde1da06f7c2fc0cbfca
TypeTreeHash:
serializedVersion: 2
Hash: b681174b78f64dbae951d5d59b41274e

View file

@ -1,12 +1,12 @@
ManifestFileVersion: 0
CRC: 2775798778
CRC: 1136233610
Hashes:
AssetFileHash:
serializedVersion: 2
Hash: 5316b8626107f17220768cc0da23660f
Hash: 101ae668a759fcb025f6a99a186dac08
TypeTreeHash:
serializedVersion: 2
Hash: 1e10a70eb77d3e9dbb43406be9c045ce
Hash: 2c80689270eb926e14ce7cc1f6116e6c
HashAppended: 0
ClassTypes:
- Class: 1
@ -37,6 +37,8 @@ ClassTypes:
Script: {fileID: 11500000, guid: 62c1e08c47081e84da8af20ea652e2a7, type: 3}
- Class: 114
Script: {fileID: 11500000, guid: d8ea112b8d0c51343bca3ebc026d0295, type: 3}
- Class: 114
Script: {fileID: 11500000, guid: 2c173ef5dba9631449b99fcbc50ff9e8, type: 3}
- Class: 115
Script: {instanceID: 0}
- Class: 212

View file

@ -3,7 +3,7 @@ CRC: 1086654757
Hashes:
AssetFileHash:
serializedVersion: 2
Hash: 1fd23e306050475e2902b2ab8ab3499f
Hash: e97c62358b178eca025a56591cc2bf92
TypeTreeHash:
serializedVersion: 2
Hash: 66d7bc0128dfa9bd2a6d8ac797c3d10f

View file

@ -1,9 +1,9 @@
ManifestFileVersion: 0
CRC: 3417415312
CRC: 78434960
Hashes:
AssetFileHash:
serializedVersion: 2
Hash: bcdfecfc8466d8120a200ba8bec35be2
Hash: d598e0b6105ee0ddea1306ecb64ba97e
TypeTreeHash:
serializedVersion: 2
Hash: 34ccacf681bd423b54afdcbd80572bc4

View file

@ -1,9 +1,9 @@
ManifestFileVersion: 0
CRC: 475114992
CRC: 2776406185
Hashes:
AssetFileHash:
serializedVersion: 2
Hash: 00245f07ed1e60e78624a147c6070fcf
Hash: 2e302cf48b40bc531bd32b21fc9e3dc2
TypeTreeHash:
serializedVersion: 2
Hash: 78b02268f01f8b6a77a608289ecb9d38
@ -108,4 +108,4 @@ Assets:
- Assets/Resources/Sfx/games/quizShow/hostDPad.ogg
- Assets/Resources/Sfx/games/quizShow/hostExplode.ogg
Dependencies:
- C:/Users/evanb/OneDrive/Documents/GitHub/HeavenStudio/Assets/StreamingAssets/karate/common
- C:/Users/rasmu/OneDrive/Dokumenter/GitHub/HeavenStudio/Assets/StreamingAssets/karate/common

View file

@ -1,9 +1,9 @@
ManifestFileVersion: 0
CRC: 2665291872
CRC: 3400926083
Hashes:
AssetFileHash:
serializedVersion: 2
Hash: 8fe3596b49e40872c2ca4de31e4acfda
Hash: 0dcee12a501424298becdd4a029a9e81
TypeTreeHash:
serializedVersion: 2
Hash: 666e1c934de72fd88bc6cb4f5baa3a36

View file

@ -3,7 +3,7 @@ CRC: 212326892
Hashes:
AssetFileHash:
serializedVersion: 2
Hash: 90b815955ee779d6d3a22cf87a709e16
Hash: 40765276bb575635d5e750e671fe00ad
TypeTreeHash:
serializedVersion: 2
Hash: 19ee8e0c3590503ff1703e27669b9083
@ -115,4 +115,4 @@ Assets:
- Assets/Resources/Sprites/Games/TapTrial/Animations/Giraffe/Giraffe.controller
- Assets/Resources/Sprites/Games/TapTrial/Animations/girl_bop/Bop.anim
Dependencies:
- C:/Users/evanb/OneDrive/Documents/GitHub/HeavenStudio/Assets/StreamingAssets/ntridol/common
- C:/Users/rasmu/OneDrive/Dokumenter/GitHub/HeavenStudio/Assets/StreamingAssets/ntridol/common

View file

@ -3,7 +3,7 @@ CRC: 2283269108
Hashes:
AssetFileHash:
serializedVersion: 2
Hash: 54dc5cc4467153fc42d7fec3c0ff99cf
Hash: bb54fc1d73dc1a84c27dae5905a5cc81
TypeTreeHash:
serializedVersion: 2
Hash: 545a4a8276e4957bfa14c0b989e80093

View file

@ -1,9 +1,9 @@
ManifestFileVersion: 0
CRC: 3698844124
CRC: 2509576142
Hashes:
AssetFileHash:
serializedVersion: 2
Hash: d1f5f29587ed40848ce7cd55fcf49589
Hash: 88b8ff1c79354272416de55f3268cbce
TypeTreeHash:
serializedVersion: 2
Hash: d644181980f918186081c0bac0c321f4

View file

@ -1,9 +1,9 @@
ManifestFileVersion: 0
CRC: 1237738764
CRC: 2034025407
Hashes:
AssetFileHash:
serializedVersion: 2
Hash: 63046efa6a9d8f6709157f97be5e3f61
Hash: e9cbba83e0ee9e79e79ff7aa6a8e90b8
TypeTreeHash:
serializedVersion: 2
Hash: d133cd3f87321d37165bad4fb3b17216

View file

@ -1,9 +1,9 @@
ManifestFileVersion: 0
CRC: 228563353
CRC: 3779117211
Hashes:
AssetFileHash:
serializedVersion: 2
Hash: c11b541d6d261d4dd9290709670eab03
Hash: 3df64602dae1644c40a73e63047b5d91
TypeTreeHash:
serializedVersion: 2
Hash: 6a87535638e108a5e3588d5397c1cf0a

View file

@ -3,7 +3,7 @@ CRC: 3626501956
Hashes:
AssetFileHash:
serializedVersion: 2
Hash: 694942fd7fd719c377ad625831f4d7da
Hash: 3022cc7faf913fff20ee843534f71dd0
TypeTreeHash:
serializedVersion: 2
Hash: 9882fa2f26ef5be324432a0a3acd846e

View file

@ -1,9 +1,9 @@
ManifestFileVersion: 0
CRC: 1339297613
CRC: 603531861
Hashes:
AssetFileHash:
serializedVersion: 2
Hash: fcbc4fce96417d5619d55885942cc258
Hash: 43643198b112932a4fdf0b1da91e8a08
TypeTreeHash:
serializedVersion: 2
Hash: a7c568f5d3a8f80a33b7dd26fe5a006a

View file

@ -3,7 +3,7 @@ CRC: 1678427662
Hashes:
AssetFileHash:
serializedVersion: 2
Hash: 695f4d61fc4319a10268a5d63bf73579
Hash: 61fc8edb7d12ddb21197f9f6d61e6618
TypeTreeHash:
serializedVersion: 2
Hash: 460be591ec703ee0603b7b23c7810e85

Binary file not shown.

View file

@ -1,9 +1,9 @@
ManifestFileVersion: 0
CRC: 856068843
CRC: 989978678
Hashes:
AssetFileHash:
serializedVersion: 2
Hash: 434b38e4c41879bd77b4b1be1facee9a
Hash: c359d15c2ac7e074b19a9f256e97de17
TypeTreeHash:
serializedVersion: 2
Hash: a038afcd41092d6fa32f3b32b70b4331

View file

@ -1,9 +1,9 @@
ManifestFileVersion: 0
CRC: 3137010974
CRC: 3273205308
Hashes:
AssetFileHash:
serializedVersion: 2
Hash: 7562ed94fdfdddfc2c404569e22e48ab
Hash: 9514f249143660c561f0a359f1b7edd5
TypeTreeHash:
serializedVersion: 2
Hash: 89039e44c9e8cd7972811ddeb5a32cd1

View file

@ -3,7 +3,7 @@ CRC: 327574655
Hashes:
AssetFileHash:
serializedVersion: 2
Hash: e34b38e1d55213a0161870cde056c2d2
Hash: 579768103208b637ae796c7a296162f4
TypeTreeHash:
serializedVersion: 2
Hash: 4a26d5115405bf719eeac2a19c298cf0

View file

@ -1,9 +1,9 @@
ManifestFileVersion: 0
CRC: 68896505
CRC: 20836068
Hashes:
AssetFileHash:
serializedVersion: 2
Hash: 05c17b1bcb126713b672a05f36a08689
Hash: 177c5870d328f716aa0421272c9470f9
TypeTreeHash:
serializedVersion: 2
Hash: f54a1062817f77cb49f442d230fcc49b

View file

@ -3,7 +3,7 @@ CRC: 277471755
Hashes:
AssetFileHash:
serializedVersion: 2
Hash: 8941246d8918d731a7ef3b29f81b75ac
Hash: a8013c8acab6ff6c0e3d077b6f6624e2
TypeTreeHash:
serializedVersion: 2
Hash: 7f5da0c07e5977d0ce994513d51f7db5

View file

@ -3,7 +3,7 @@ CRC: 1725841183
Hashes:
AssetFileHash:
serializedVersion: 2
Hash: 35a167bba48cbe81b565de21cc5212c8
Hash: d617b45ed083d248765f851fdd4edc8b
TypeTreeHash:
serializedVersion: 2
Hash: 72449c958dbfd650c57600192572509b

View file

@ -1,9 +1,9 @@
ManifestFileVersion: 0
CRC: 3808908538
CRC: 2970177517
Hashes:
AssetFileHash:
serializedVersion: 2
Hash: 02b26716ece51845a38fe48426528ba1
Hash: 7c303303ce9e13f1b6a6a9e12efff2de
TypeTreeHash:
serializedVersion: 2
Hash: 1bede10b13a08b81d2554af8dc386ffb

Binary file not shown.

View file

@ -1,9 +1,9 @@
ManifestFileVersion: 0
CRC: 626420223
CRC: 202221366
Hashes:
AssetFileHash:
serializedVersion: 2
Hash: d0090c25cf0973e711dbd565aa387cfd
Hash: ee36ed40cf955dfdc5398951be5fd93f
TypeTreeHash:
serializedVersion: 2
Hash: aa4e522fd1136788371ab66bc52daa28
@ -125,4 +125,4 @@ Assets:
- Assets/Resources/Sfx/games/djSchool/scratchoHeyLoud1.ogg
- Assets/Resources/Sprites/Games/DJSchool/Animations/Student/IdleBop.anim
Dependencies:
- C:/Users/evanb/OneDrive/Documents/GitHub/HeavenStudio/Assets/StreamingAssets/rvldate/common
- C:/Users/rasmu/OneDrive/Dokumenter/GitHub/HeavenStudio/Assets/StreamingAssets/rvldate/common

View file

@ -1,9 +1,9 @@
ManifestFileVersion: 0
CRC: 1108434953
CRC: 486533672
Hashes:
AssetFileHash:
serializedVersion: 2
Hash: 19c52ab6ab02ddb605dd4975795b7b13
Hash: df08cbdd6596766ea7fbc3c36fb20300
TypeTreeHash:
serializedVersion: 2
Hash: 21456e7675db7a47a10568aeed553424

View file

@ -1,9 +1,9 @@
ManifestFileVersion: 0
CRC: 1383471329
CRC: 2660644677
Hashes:
AssetFileHash:
serializedVersion: 2
Hash: d8b43c8047f62e6fa4625216fdd1e79e
Hash: cbbdf7d02af79126622c4fefdfa1487d
TypeTreeHash:
serializedVersion: 2
Hash: 987042eda37a56b13dfaba3bc9557005

View file

@ -1,9 +1,9 @@
ManifestFileVersion: 0
CRC: 2131398080
CRC: 2454993904
Hashes:
AssetFileHash:
serializedVersion: 2
Hash: a73631381bd8e5fbbecfdd0c8e1ea663
Hash: abd7163861ddadc823c360495cc7a8fb
TypeTreeHash:
serializedVersion: 2
Hash: 974ea934299ce5c71bcd7b9022e14cb9

View file

@ -1,9 +1,9 @@
ManifestFileVersion: 0
CRC: 2896413815
CRC: 89228373
Hashes:
AssetFileHash:
serializedVersion: 2
Hash: 57f6be52825b8f1f0484565784bb7df3
Hash: 248d70b7b10682c27677084cd15177ba
TypeTreeHash:
serializedVersion: 2
Hash: b34bf4f4a153c821f231d97d8dbb17bf

View file

@ -3,7 +3,7 @@ CRC: 3939051657
Hashes:
AssetFileHash:
serializedVersion: 2
Hash: ce985f100d2f5d0940fb613bd86f4f91
Hash: d7238faee24ab1af3a24e18f7d48b444
TypeTreeHash:
serializedVersion: 2
Hash: c21d61fe394c58399df3c6fb5c7c99b3

View file

@ -1,9 +1,9 @@
ManifestFileVersion: 0
CRC: 1640874466
CRC: 425298165
Hashes:
AssetFileHash:
serializedVersion: 2
Hash: 3bba5baa9f38be6896b3b980f9c1777a
Hash: 5314faddf43e6bd11188f18cf09066c8
TypeTreeHash:
serializedVersion: 2
Hash: 343d65511dfe0d43d6049e61b3f8026f

View file

@ -1,9 +1,9 @@
ManifestFileVersion: 0
CRC: 3488930233
CRC: 713330067
Hashes:
AssetFileHash:
serializedVersion: 2
Hash: a9c9dac999629c0c527c02062936b2ce
Hash: 535c4f45a3ceb3b47eddd748655973d5
TypeTreeHash:
serializedVersion: 2
Hash: 51a0b88ccba7cafc2f0ee80d78c276ea

View file

@ -1,9 +1,9 @@
ManifestFileVersion: 0
CRC: 3642417611
CRC: 1943216595
Hashes:
AssetFileHash:
serializedVersion: 2
Hash: dd8499b116e760f1d3aa7941094bebde
Hash: 78caaefeb5375326df23b407ffa4da57
TypeTreeHash:
serializedVersion: 2
Hash: 74b5869325cedae7df7222412e11a18e

View file

@ -1,9 +1,9 @@
ManifestFileVersion: 0
CRC: 515894768
CRC: 2126864230
Hashes:
AssetFileHash:
serializedVersion: 2
Hash: 6b97b247f0098f06fd4604df987d1284
Hash: d9fc3664ee82ab3f504f472166da6267
TypeTreeHash:
serializedVersion: 2
Hash: f3b8ce2f77980d9f2171a767aefb0cc5

View file

@ -3,7 +3,7 @@ CRC: 1166576383
Hashes:
AssetFileHash:
serializedVersion: 2
Hash: f0ae254b224d424b5d3f8feeb6de068f
Hash: 66dfc92a596424905b5c760ad439dc18
TypeTreeHash:
serializedVersion: 2
Hash: 96a5a577eabf548f980146be7c5c5dfa

View file

@ -1,9 +1,9 @@
ManifestFileVersion: 0
CRC: 657630586
CRC: 433932746
Hashes:
AssetFileHash:
serializedVersion: 2
Hash: a23c6cfbb200872e5900c1aefc065593
Hash: fb9f8bcbdccbaeedccf7f3030752edda
TypeTreeHash:
serializedVersion: 2
Hash: 227a86ac9715dddef278f0490af191fe

View file

@ -3,7 +3,7 @@ CRC: 3923060005
Hashes:
AssetFileHash:
serializedVersion: 2
Hash: ddfbcaf4cebdbc77abee6fa76ae24eea
Hash: 9ea25df45a892548185b67338679385a
TypeTreeHash:
serializedVersion: 2
Hash: 85ee816236efbc3eb8eee4328b833881

View file

@ -1,9 +1,9 @@
ManifestFileVersion: 0
CRC: 930172043
CRC: 517210605
Hashes:
AssetFileHash:
serializedVersion: 2
Hash: 9b9dc66adc2b1846f9419d9a58cb6759
Hash: 129fec45a185d42f8c6f80460b3722ea
TypeTreeHash:
serializedVersion: 2
Hash: d7a2aa66ed419696bcac7084279f269a
@ -113,4 +113,4 @@ Assets:
- Assets/Resources/Sprites/Games/DoubleDate/Animations/WeaselsHappy.anim
- Assets/Resources/Sprites/Games/DoubleDate/Animations/WeaselsHide.anim
Dependencies:
- C:/Users/evanb/OneDrive/Documents/GitHub/HeavenStudio/Assets/StreamingAssets/ntrdj/common
- C:/Users/rasmu/OneDrive/Dokumenter/GitHub/HeavenStudio/Assets/StreamingAssets/ntrdj/common

View file

@ -3,7 +3,7 @@ CRC: 2090388953
Hashes:
AssetFileHash:
serializedVersion: 2
Hash: ad96894296d74ec5b5b200f0f4a27631
Hash: cbbd7b91a125fa36d9a395ea43f6f50e
TypeTreeHash:
serializedVersion: 2
Hash: 8b55a6917405b0202af0602af7feed59

View file

@ -3,7 +3,7 @@ CRC: 299707247
Hashes:
AssetFileHash:
serializedVersion: 2
Hash: d050445963bac1c437880ff1fb20bc92
Hash: 5ad434fa1bd7c44d0e100f5c115b2c42
TypeTreeHash:
serializedVersion: 2
Hash: 1131991bd32567759f271afad6e2bfa7

View file

@ -3,7 +3,7 @@ CRC: 1849456549
Hashes:
AssetFileHash:
serializedVersion: 2
Hash: bb9e618b3eca60980bd9fbae91f33ac1
Hash: 17a1d21238f21454df64081fae3ff1a4
TypeTreeHash:
serializedVersion: 2
Hash: d219f359cb3385c42103f8714b1ebcb1

View file

@ -1,9 +1,9 @@
ManifestFileVersion: 0
CRC: 1260055346
CRC: 1864211669
Hashes:
AssetFileHash:
serializedVersion: 2
Hash: b073e950dab638d8156ec0e1c67de7b0
Hash: 70dae36aace686dde864da0e49b4dd40
TypeTreeHash:
serializedVersion: 2
Hash: 5542e4d11fa90b3df909513c3dc51ab6

View file

@ -1,9 +1,9 @@
ManifestFileVersion: 0
CRC: 1737330536
CRC: 3683042999
Hashes:
AssetFileHash:
serializedVersion: 2
Hash: 0245e4c82d51301e2234f16c6fc81b3b
Hash: 3ff1ff2cf9adf04658676cf10f2e6f10
TypeTreeHash:
serializedVersion: 2
Hash: 3e8c7d8755f6df3ed3fcea84d97f9900

View file

@ -1,9 +1,9 @@
ManifestFileVersion: 0
CRC: 2576148078
CRC: 3446959443
Hashes:
AssetFileHash:
serializedVersion: 2
Hash: 58c265d857a20971ebd17680b23c8101
Hash: 1fa4e45464a35277630d436f0857ec2f
TypeTreeHash:
serializedVersion: 2
Hash: ffb5d2113fd2d590f8537bbc04f36b07

View file

@ -1,9 +1,9 @@
ManifestFileVersion: 0
CRC: 67785069
CRC: 3050640261
Hashes:
AssetFileHash:
serializedVersion: 2
Hash: 2c321270b1bf07feaea5f394979098ae
Hash: 84996fe85e826a6150bdb33094cb82fb
TypeTreeHash:
serializedVersion: 2
Hash: 651b0dae5ce05f85330163cc78a161ee

View file

@ -3,7 +3,7 @@ CRC: 3782009495
Hashes:
AssetFileHash:
serializedVersion: 2
Hash: 1392c8a968742719e480e4349998bc61
Hash: 790ff64aa78d4bafcd56143473bbb083
TypeTreeHash:
serializedVersion: 2
Hash: 1700dff61e9a39c2f981a91472deb25e

View file

@ -1,9 +1,9 @@
ManifestFileVersion: 0
CRC: 1835188912
CRC: 1066493538
Hashes:
AssetFileHash:
serializedVersion: 2
Hash: bd4d09439f0247420cca5b0a475ad5cb
Hash: e5813385a0b9b59819c85887beaca3dc
TypeTreeHash:
serializedVersion: 2
Hash: 6ddefc915b4006f12246ed1f50bf5b87