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

starting with inputs

Browse source 
rn they're broken and i can't tell why :(

* heavily commented out code in ThrowObject.cs
* added option to disable the bird's FlyIn SFX
* some debug stuff
* some scheduled inputs (that AREN'T. WORKING.)
This commit is contained in:
AstrlJelly 2023-01-25 21:11:13 -05:00
parent bdd8b32567
commit 9f70b02b7c
6 changed files with 693 additions and 65 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

554
Assets/Resources/Fonts/rodin/FOT-Rodin Pro M SDF Dynamic.asset
View file

File diff suppressed because one or more lines are too long

95
Assets/Resources/Games/dogNinja.prefab
View file

@ -97,7 +97,7 @@ MonoBehaviour:
m_EditorClassIdentifier:
inList: 0
state:
gameObject: {fileID: 0}
gameObject: {fileID: 119991411479083905}
early: 0
perfect: 0
late: 0
@ -107,7 +107,6 @@ MonoBehaviour:
isEligible: 0
triggersAutoplay: 1
startBeat: 0
type: 0
CurveFromLeft: {fileID: 1761052573981030483}
CurveFromRight: {fileID: 8610298732975356966}
--- !u!1 &127654075222335198
@ -136,7 +135,8 @@ Transform:
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Children:
- {fileID: 1048894730547048102}
m_Father: {fileID: 99701050536977662}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@ -1043,8 +1043,9 @@ GameObject:
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 7587101184365024327}
- component: {fileID: 1157211771115109073}
- component: {fileID: 6708362883365422231}
- component: {fileID: 2548421167915279146}
m_Layer: 0
m_Name: Sign
m_TagString: Untagged
@ -1052,20 +1053,25 @@ GameObject:
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &7587101184365024327
Transform:
--- !u!224 &1157211771115109073
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2238146999928418467}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: -5.67, y: -0.123, z: 20.75}
m_LocalPosition: {x: 0, y: 0, z: 20.75}
m_LocalScale: {x: 1.171, y: 1.171, z: 1.171}
m_Children: []
m_Father: {fileID: 6570085815560366024}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: -5.67, y: -0.123}
m_SizeDelta: {x: 8.4, y: 3.44}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!212 &6708362883365422231
SpriteRenderer:
m_ObjectHideFlags: 0
@ -1117,6 +1123,14 @@ SpriteRenderer:
m_WasSpriteAssigned: 1
m_MaskInteraction: 0
m_SpriteSortPoint: 0
--- !u!222 &2548421167915279146
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2238146999928418467}
m_CullTransparentMesh: 1
--- !u!1 &2345899427382000280
GameObject:
m_ObjectHideFlags: 0
@ -1308,7 +1322,33 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: b82899be2d36d2d48ad3ef1a3ce1c7de, type: 3}
m_Name:
m_EditorClassIdentifier:
SoundSequences: []
SoundSequences:
- name: hereWeGo
sequence:
game: 1
force: 0
clips:
- clip: here
beat: 0
pitch: 0
volume: 0
looping: 0
offset: 0
parameters: []
- clip: we
beat: 0
pitch: 0
volume: 0
looping: 0
offset: 0
parameters: []
- clip: go
beat: 0
pitch: 0
volume: 0
looping: 0
offset: 0
parameters: []
EligibleHits: []
scheduledInputs: []
firstEnable: 0
@ -1316,7 +1356,7 @@ MonoBehaviour:
DogAnim: {fileID: 1770250701376598399}
ObjectLeftBase: {fileID: 5163996841361280296}
ObjectRightBase: {fileID: 119991411479083905}
HalvesBase: {fileID: 0}
HalvesBase: {fileID: 8462363345267808632}
FullBird: {fileID: 3439822116337821266}
Dog: {fileID: 7056643801436531617}
ObjectHolder: {fileID: 1671099869309974123}
@ -1368,7 +1408,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
m_IsActive: 1
--- !u!4 &6570085815560366024
Transform:
m_ObjectHideFlags: 0
@ -1381,7 +1421,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 9090671386772390765}
- {fileID: 7587101184365024327}
- {fileID: 1157211771115109073}
m_Father: {fileID: 99701050536977662}
m_RootOrder: 6
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@ -1831,7 +1871,7 @@ MonoBehaviour:
m_EditorClassIdentifier:
inList: 0
state:
gameObject: {fileID: 0}
gameObject: {fileID: 5163996841361280296}
early: 0
perfect: 0
late: 0
@ -1841,7 +1881,6 @@ MonoBehaviour:
isEligible: 0
triggersAutoplay: 1
startBeat: 0
type: 0
CurveFromLeft: {fileID: 1761052573981030483}
CurveFromRight: {fileID: 8610298732975356966}
--- !u!1 &5340671340987037539
@ -2472,6 +2511,36 @@ MonoBehaviour:
handleType: 0
leftHandleLocalPosition: {x: 0.7853651, y: -0.94227105, z: -0}
rightHandleLocalPosition: {x: -0.7853651, y: 0.94227105, z: 0}
--- !u!1 &8462363345267808632
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1048894730547048102}
m_Layer: 0
m_Name: HalvesBase
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &1048894730547048102
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8462363345267808632}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 2078672318315355962}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &8475310029466910972
GameObject:
m_ObjectHideFlags: 0

4
Assets/Scripts/AppInfo.cs
View file

@ -2,8 +2,8 @@ using System;
public static class AppInfo {
//--- AutoGenerated.begin
public const string Version = "0.0.967";
public static readonly DateTime Date = new DateTime(2023, 01, 23, 20, 06, 31, 686, DateTimeKind.Utc);
public const string Version = "0.0.969";
public static readonly DateTime Date = new DateTime(2023, 01, 24, 22, 48, 00, 679, DateTimeKind.Utc);
//--- AutoGenerated.end
}

55
Assets/Scripts/Games/DogNinja/DogNinja.cs
View file

@ -41,14 +41,18 @@ namespace HeavenStudio.Games.Loaders
},
new GameAction("CutEverything", "Cut Everything!")
{
function = delegate { DogNinja.instance.CutEverything(eventCaller.currentEntity.beat); },
function = delegate { DogNinja.instance.CutEverything(eventCaller.currentEntity.beat, eventCaller.currentEntity["Toggle"]); },
defaultLength = 0.5f,
parameters = new List<Param>()
{
new Param("Toggle", true, "Play Sound", "Whether to play the 'FlyIn' SFX or not"),
}
},
new GameAction("HereWeGo", "Here We Go!")
{
function = delegate { DogNinja.instance.HereWeGo(eventCaller.currentEntity.beat); },
defaultLength = 2,
inactiveFunction = delegate { DogNinja.instance.HereWeGo(eventCaller.currentEntity.beat); },
inactiveFunction = delegate { DogNinja.HereWeGoInactive(eventCaller.currentEntity.beat); },
},
});
}
@ -82,6 +86,7 @@ namespace HeavenStudio.Games
private float lastReportedBeat = 0f;
private bool birdOnScreen = false;
private bool preparing = false;
public static DogNinja instance;
@ -105,18 +110,16 @@ namespace HeavenStudio.Games
private void Update()
{
if (Conductor.instance.ReportBeat(ref lastReportedBeat))
if (Conductor.instance.ReportBeat(ref lastReportedBeat) && !preparing)
{
DogAnim.Play("Bop", 0, 0);
}
/*
if (Input.GetKeyDown(KeyCode.S))
if (Input.GetKeyDown(KeyCode.D))
{
Debug.Log("bop test -AJ");
DogAnim.Play("Bop");
Debug.Log("teehee :)");
DogAnim.Play("Bop", 0, 0);
}
*/
}
public void Bop(float beat)
@ -124,25 +127,32 @@ namespace HeavenStudio.Games
DogAnim.Play("Bop");
}
public void ThrowObjectLeft(float beat, int type)
public void ThrowObjectLeft(float beat, int ObjType)
{
GameObject fo = Instantiate(ObjectLeftBase);
fo.transform.parent = ObjectLeftBase.transform.parent;
ThrowObject ObjectType = fo.GetComponent<ThrowObject>();
ObjectType.startBeat = beat;
//ObjectType.type = type;
fo.SetActive(true);
bool fromLeft = true;
Jukebox.PlayOneShotGame("dogNinja/fruit1");
//GameObject fo = Instantiate(ObjectLeftBase);
//ThrowObject Object = Instantiate(ObjectLeftBase).GetComponent<ThrowObject>();
//Object.startBeat = beat;
//ThrowObjectTEST();
}
public void ThrowObjectRight(float beat)
{
bool fromLeft = false;
Jukebox.PlayOneShotGame("dogNinja/fruit1");
}
public void CutEverything(float beat)
public void CutEverything(float beat, bool sound)
{
if (!birdOnScreen) {
Jukebox.PlayOneShotGame("dogNinja/bird_flap");
if (sound) {
Jukebox.PlayOneShotGame("dogNinja/bird_flap");
}
BirdAnim.Play("FlyIn", 0, 0);
birdOnScreen = true;
} else {
@ -156,9 +166,18 @@ namespace HeavenStudio.Games
MultiSound.Play(new MultiSound.Sound[] {
new MultiSound.Sound("dogNinja/here", beat),
new MultiSound.Sound("dogNinja/we", beat + 0.5f),
new MultiSound.Sound("dogNinja/go", beat + 1f),
new MultiSound.Sound("dogNinja/go", beat + 1f)
}, forcePlay: true);
}
public static void HereWeGoInactive(float beat)
{
MultiSound.Sound[] HereWeGoSFX = new MultiSound.Sound[] {
new MultiSound.Sound("dogNinja/here", beat),
new MultiSound.Sound("dogNinja/we", beat + 0.5f),
new MultiSound.Sound("dogNinja/go", beat + 1f)
};
}
}
}

44
Assets/Scripts/Games/DogNinja/ThrowObject.cs
View file

@ -14,6 +14,8 @@ namespace HeavenStudio.Games.Scripts_DogNinja
bool flying = true;
float flyBeats;
public int ObjType;
bool fromLeft;
//public ObjectType type;
@ -26,13 +28,16 @@ namespace HeavenStudio.Games.Scripts_DogNinja
private void Awake()
{
game = DogNinja.instance;
}
private void Start()
{
//Jukebox.PlayOneShotGame("dogNinja/fruit1");
game.ScheduleInput(startBeat, 1f, InputType.STANDARD_DOWN, Hit, Out, Miss);
game.ScheduleInput(startBeat, 1f, InputType.STANDARD_DOWN, Just, Out, Miss);
//debug stuff below
Debug.Log("it's a/an "+ObjType);
}
private void Update()
@ -43,57 +48,58 @@ namespace HeavenStudio.Games.Scripts_DogNinja
float flyPos = cond.GetPositionFromBeat(startBeat, flyBeats);
flyPos *= 0.6f;
/*
if (true)
if (fromLeft)
{
transform.position = CurveFromLeft.GetPoint(flyPos);
} else {
transform.position = CurveFromRight.GetPoint(flyPos);
}
*/
if (flyPos > 1f)
// DESTROYS GAME OBJECT! UNINTENTIONALLY!
/* if (flyPos > 1f)
{
GameObject.Destroy(gameObject);
return;
}
} */
}
}
void CutObject()
{
flying = false;
//flying = false;
//game.headAndBodyAnim.Play("BiteR", 0, 0);
Jukebox.PlayOneShotGame("dogNinja/fruit2");
SpawnHalves();
//SpawnHalves();
GameObject.Destroy(gameObject);
//GameObject.Destroy(gameObject);
}
private void Just(PlayerActionEvent caller, float state)
private void Hit(PlayerActionEvent caller, float state)
{
if (state >= 1f || state <= -1f) { //todo: proper near miss feedback
/* if (state >= 1f || state <= -1f) { //todo: proper near miss feedback
//game.headAndBodyAnim.Play("BiteR", 0, 0);
}
} */
CutObject();
}
private void Miss(PlayerActionEvent caller)
{
Jukebox.PlayOneShot("dogNinja/fruit1");
BeatAction.New(game.gameObject, new List<BeatAction.Action>()
/* BeatAction.New(game.gameObject, new List<BeatAction.Action>()
{
new BeatAction.Action(startBeat+ 2.45f, delegate {
Destroy(this.gameObject);
}),
});
}); */
}
private void Out(PlayerActionEvent caller) {}
void SpawnHalves()
// WILL USE FOR SPAWNING HALVES
/* void SpawnHalves()
{
var HalvesGO = GameObject.Instantiate(game.HalvesBase, game.HalvesHolder);
HalvesGO.SetActive(true);
@ -105,6 +111,6 @@ namespace HeavenStudio.Games.Scripts_DogNinja
newGradient.mode = ParticleSystemGradientMode.RandomColor;
main.startColor = newGradient;
ps.Play();
}
} */
}
}

6
ProjectSettings/ProjectSettings.asset
View file

@ -134,7 +134,7 @@ PlayerSettings:
16:10: 1
16:9: 1
Others: 1
bundleVersion: 0.0.967
bundleVersion: 0.0.969
preloadedAssets: []
metroInputSource: 0
wsaTransparentSwapchain: 0
@ -155,11 +155,11 @@ PlayerSettings:
applicationIdentifier:
Standalone: com.Megaminerzero.HeavenStudio
buildNumber:
Standalone: 967
Standalone: 969
iPhone: 0
tvOS: 0
overrideDefaultApplicationIdentifier: 0
AndroidBundleVersionCode: 967
AndroidBundleVersionCode: 969
AndroidMinSdkVersion: 19
AndroidTargetSdkVersion: 0
AndroidPreferredInstallLocation: 1