actual last fixes + ass buns
This commit is contained in:
parent
01083b709b
commit
27c056320a
|
|
@ -1699,26 +1699,26 @@ MonoBehaviour:
|
||||||
m_Name:
|
m_Name:
|
||||||
m_EditorClassIdentifier:
|
m_EditorClassIdentifier:
|
||||||
SoundSequences:
|
SoundSequences:
|
||||||
- name: hereWeGo
|
- name: here_we_go
|
||||||
sequence:
|
sequence:
|
||||||
game: 1
|
game: 1
|
||||||
force: 1
|
force: 1
|
||||||
clips:
|
clips:
|
||||||
- clip: here
|
- clip: dogNinja/here
|
||||||
beat: 0
|
beat: 0
|
||||||
pitch: 0
|
pitch: 0
|
||||||
volume: 0
|
volume: 0
|
||||||
looping: 0
|
looping: 0
|
||||||
offset: 0
|
offset: 0
|
||||||
parameters: []
|
parameters: []
|
||||||
- clip: we
|
- clip: dogNinja/we
|
||||||
beat: 0.5
|
beat: 0.5
|
||||||
pitch: 0
|
pitch: 0
|
||||||
volume: 0
|
volume: 0
|
||||||
looping: 0
|
looping: 0
|
||||||
offset: 0
|
offset: 0
|
||||||
parameters: []
|
parameters: []
|
||||||
- clip: go
|
- clip: dogNinja/go
|
||||||
beat: 1
|
beat: 1
|
||||||
pitch: 0
|
pitch: 0
|
||||||
volume: 0
|
volume: 0
|
||||||
|
|
|
||||||
|
|
@ -4,5 +4,5 @@ NativeFormatImporter:
|
||||||
externalObjects: {}
|
externalObjects: {}
|
||||||
mainObjectFileID: 9100000
|
mainObjectFileID: 9100000
|
||||||
userData:
|
userData:
|
||||||
assetBundleName:
|
assetBundleName: ntrninja/common
|
||||||
assetBundleVariant:
|
assetBundleVariant:
|
||||||
|
|
|
||||||
|
|
@ -4,5 +4,5 @@ NativeFormatImporter:
|
||||||
externalObjects: {}
|
externalObjects: {}
|
||||||
mainObjectFileID: 7400000
|
mainObjectFileID: 7400000
|
||||||
userData:
|
userData:
|
||||||
assetBundleName:
|
assetBundleName: ntrninja/common
|
||||||
assetBundleVariant:
|
assetBundleVariant:
|
||||||
|
|
|
||||||
|
|
@ -4,5 +4,5 @@ NativeFormatImporter:
|
||||||
externalObjects: {}
|
externalObjects: {}
|
||||||
mainObjectFileID: 7400000
|
mainObjectFileID: 7400000
|
||||||
userData:
|
userData:
|
||||||
assetBundleName:
|
assetBundleName: ntrninja/common
|
||||||
assetBundleVariant:
|
assetBundleVariant:
|
||||||
|
|
|
||||||
|
|
@ -4,5 +4,5 @@ NativeFormatImporter:
|
||||||
externalObjects: {}
|
externalObjects: {}
|
||||||
mainObjectFileID: 7400000
|
mainObjectFileID: 7400000
|
||||||
userData:
|
userData:
|
||||||
assetBundleName:
|
assetBundleName: ntrninja/common
|
||||||
assetBundleVariant:
|
assetBundleVariant:
|
||||||
|
|
|
||||||
|
|
@ -4,5 +4,5 @@ NativeFormatImporter:
|
||||||
externalObjects: {}
|
externalObjects: {}
|
||||||
mainObjectFileID: 7400000
|
mainObjectFileID: 7400000
|
||||||
userData:
|
userData:
|
||||||
assetBundleName:
|
assetBundleName: ntrninja/common
|
||||||
assetBundleVariant:
|
assetBundleVariant:
|
||||||
|
|
|
||||||
|
|
@ -4,5 +4,5 @@ NativeFormatImporter:
|
||||||
externalObjects: {}
|
externalObjects: {}
|
||||||
mainObjectFileID: 7400000
|
mainObjectFileID: 7400000
|
||||||
userData:
|
userData:
|
||||||
assetBundleName:
|
assetBundleName: ntrninja/common
|
||||||
assetBundleVariant:
|
assetBundleVariant:
|
||||||
|
|
|
||||||
|
|
@ -4,5 +4,5 @@ NativeFormatImporter:
|
||||||
externalObjects: {}
|
externalObjects: {}
|
||||||
mainObjectFileID: 7400000
|
mainObjectFileID: 7400000
|
||||||
userData:
|
userData:
|
||||||
assetBundleName:
|
assetBundleName: ntrninja/common
|
||||||
assetBundleVariant:
|
assetBundleVariant:
|
||||||
|
|
|
||||||
|
|
@ -4,5 +4,5 @@ NativeFormatImporter:
|
||||||
externalObjects: {}
|
externalObjects: {}
|
||||||
mainObjectFileID: 9100000
|
mainObjectFileID: 9100000
|
||||||
userData:
|
userData:
|
||||||
assetBundleName:
|
assetBundleName: ntrninja/common
|
||||||
assetBundleVariant:
|
assetBundleVariant:
|
||||||
|
|
|
||||||
|
|
@ -4,5 +4,5 @@ NativeFormatImporter:
|
||||||
externalObjects: {}
|
externalObjects: {}
|
||||||
mainObjectFileID: 7400000
|
mainObjectFileID: 7400000
|
||||||
userData:
|
userData:
|
||||||
assetBundleName:
|
assetBundleName: ntrninja/common
|
||||||
assetBundleVariant:
|
assetBundleVariant:
|
||||||
|
|
|
||||||
|
|
@ -4,5 +4,5 @@ NativeFormatImporter:
|
||||||
externalObjects: {}
|
externalObjects: {}
|
||||||
mainObjectFileID: 7400000
|
mainObjectFileID: 7400000
|
||||||
userData:
|
userData:
|
||||||
assetBundleName:
|
assetBundleName: ntrninja/common
|
||||||
assetBundleVariant:
|
assetBundleVariant:
|
||||||
|
|
|
||||||
|
|
@ -4,5 +4,5 @@ NativeFormatImporter:
|
||||||
externalObjects: {}
|
externalObjects: {}
|
||||||
mainObjectFileID: 0
|
mainObjectFileID: 0
|
||||||
userData:
|
userData:
|
||||||
assetBundleName:
|
assetBundleName: ntrninja/common
|
||||||
assetBundleVariant:
|
assetBundleVariant:
|
||||||
|
|
|
||||||
|
|
@ -4,5 +4,5 @@ NativeFormatImporter:
|
||||||
externalObjects: {}
|
externalObjects: {}
|
||||||
mainObjectFileID: 0
|
mainObjectFileID: 0
|
||||||
userData:
|
userData:
|
||||||
assetBundleName:
|
assetBundleName: ntrninja/common
|
||||||
assetBundleVariant:
|
assetBundleVariant:
|
||||||
|
|
|
||||||
|
|
@ -4,5 +4,5 @@ NativeFormatImporter:
|
||||||
externalObjects: {}
|
externalObjects: {}
|
||||||
mainObjectFileID: 0
|
mainObjectFileID: 0
|
||||||
userData:
|
userData:
|
||||||
assetBundleName:
|
assetBundleName: ntrninja/common
|
||||||
assetBundleVariant:
|
assetBundleVariant:
|
||||||
|
|
|
||||||
|
|
@ -4,5 +4,5 @@ NativeFormatImporter:
|
||||||
externalObjects: {}
|
externalObjects: {}
|
||||||
mainObjectFileID: 7400000
|
mainObjectFileID: 7400000
|
||||||
userData:
|
userData:
|
||||||
assetBundleName:
|
assetBundleName: ntrninja/common
|
||||||
assetBundleVariant:
|
assetBundleVariant:
|
||||||
|
|
|
||||||
|
|
@ -4,5 +4,5 @@ NativeFormatImporter:
|
||||||
externalObjects: {}
|
externalObjects: {}
|
||||||
mainObjectFileID: 7400000
|
mainObjectFileID: 7400000
|
||||||
userData:
|
userData:
|
||||||
assetBundleName:
|
assetBundleName: ntrninja/common
|
||||||
assetBundleVariant:
|
assetBundleVariant:
|
||||||
|
|
|
||||||
|
|
@ -4,5 +4,5 @@ NativeFormatImporter:
|
||||||
externalObjects: {}
|
externalObjects: {}
|
||||||
mainObjectFileID: 7400000
|
mainObjectFileID: 7400000
|
||||||
userData:
|
userData:
|
||||||
assetBundleName:
|
assetBundleName: ntrninja/common
|
||||||
assetBundleVariant:
|
assetBundleVariant:
|
||||||
|
|
|
||||||
|
|
@ -4,5 +4,5 @@ NativeFormatImporter:
|
||||||
externalObjects: {}
|
externalObjects: {}
|
||||||
mainObjectFileID: 7400000
|
mainObjectFileID: 7400000
|
||||||
userData:
|
userData:
|
||||||
assetBundleName:
|
assetBundleName: ntrninja/common
|
||||||
assetBundleVariant:
|
assetBundleVariant:
|
||||||
|
|
|
||||||
|
|
@ -4,5 +4,5 @@ NativeFormatImporter:
|
||||||
externalObjects: {}
|
externalObjects: {}
|
||||||
mainObjectFileID: 7400000
|
mainObjectFileID: 7400000
|
||||||
userData:
|
userData:
|
||||||
assetBundleName:
|
assetBundleName: ntrninja/common
|
||||||
assetBundleVariant:
|
assetBundleVariant:
|
||||||
|
|
|
||||||
|
|
@ -4,5 +4,5 @@ NativeFormatImporter:
|
||||||
externalObjects: {}
|
externalObjects: {}
|
||||||
mainObjectFileID: 9100000
|
mainObjectFileID: 9100000
|
||||||
userData:
|
userData:
|
||||||
assetBundleName:
|
assetBundleName: ntrninja/common
|
||||||
assetBundleVariant:
|
assetBundleVariant:
|
||||||
|
|
|
||||||
|
|
@ -4,5 +4,5 @@ NativeFormatImporter:
|
||||||
externalObjects: {}
|
externalObjects: {}
|
||||||
mainObjectFileID: 7400000
|
mainObjectFileID: 7400000
|
||||||
userData:
|
userData:
|
||||||
assetBundleName:
|
assetBundleName: ntrninja/common
|
||||||
assetBundleVariant:
|
assetBundleVariant:
|
||||||
|
|
|
||||||
|
|
@ -4,5 +4,5 @@ NativeFormatImporter:
|
||||||
externalObjects: {}
|
externalObjects: {}
|
||||||
mainObjectFileID: 0
|
mainObjectFileID: 0
|
||||||
userData:
|
userData:
|
||||||
assetBundleName:
|
assetBundleName: ntrninja/common
|
||||||
assetBundleVariant:
|
assetBundleVariant:
|
||||||
|
|
|
||||||
|
|
@ -4,5 +4,5 @@ NativeFormatImporter:
|
||||||
externalObjects: {}
|
externalObjects: {}
|
||||||
mainObjectFileID: 9100000
|
mainObjectFileID: 9100000
|
||||||
userData:
|
userData:
|
||||||
assetBundleName:
|
assetBundleName: ntrninja/common
|
||||||
assetBundleVariant:
|
assetBundleVariant:
|
||||||
|
|
|
||||||
|
|
@ -4,5 +4,5 @@ NativeFormatImporter:
|
||||||
externalObjects: {}
|
externalObjects: {}
|
||||||
mainObjectFileID: 7400000
|
mainObjectFileID: 7400000
|
||||||
userData:
|
userData:
|
||||||
assetBundleName:
|
assetBundleName: ntrninja/common
|
||||||
assetBundleVariant:
|
assetBundleVariant:
|
||||||
|
|
|
||||||
|
|
@ -4,5 +4,5 @@ NativeFormatImporter:
|
||||||
externalObjects: {}
|
externalObjects: {}
|
||||||
mainObjectFileID: 0
|
mainObjectFileID: 0
|
||||||
userData:
|
userData:
|
||||||
assetBundleName:
|
assetBundleName: ntrninja/common
|
||||||
assetBundleVariant:
|
assetBundleVariant:
|
||||||
|
|
|
||||||
|
|
@ -689,7 +689,7 @@ TextureImporter:
|
||||||
width: 110
|
width: 110
|
||||||
height: 201
|
height: 201
|
||||||
alignment: 0
|
alignment: 0
|
||||||
pivot: {x: 0, y: 0}
|
pivot: {x: 0.5, y: 0.5}
|
||||||
border: {x: 0, y: 0, z: 0, w: 0}
|
border: {x: 0, y: 0, z: 0, w: 0}
|
||||||
outline: []
|
outline: []
|
||||||
physicsShape: []
|
physicsShape: []
|
||||||
|
|
@ -710,7 +710,7 @@ TextureImporter:
|
||||||
width: 103
|
width: 103
|
||||||
height: 198
|
height: 198
|
||||||
alignment: 0
|
alignment: 0
|
||||||
pivot: {x: 0, y: 0}
|
pivot: {x: 0.5, y: 0.5}
|
||||||
border: {x: 0, y: 0, z: 0, w: 0}
|
border: {x: 0, y: 0, z: 0, w: 0}
|
||||||
outline: []
|
outline: []
|
||||||
physicsShape: []
|
physicsShape: []
|
||||||
|
|
@ -731,7 +731,7 @@ TextureImporter:
|
||||||
width: 78
|
width: 78
|
||||||
height: 199
|
height: 199
|
||||||
alignment: 0
|
alignment: 0
|
||||||
pivot: {x: 0, y: 0}
|
pivot: {x: 0.5, y: 0.5}
|
||||||
border: {x: 0, y: 0, z: 0, w: 0}
|
border: {x: 0, y: 0, z: 0, w: 0}
|
||||||
outline: []
|
outline: []
|
||||||
physicsShape: []
|
physicsShape: []
|
||||||
|
|
@ -743,6 +743,27 @@ TextureImporter:
|
||||||
indices:
|
indices:
|
||||||
edges: []
|
edges: []
|
||||||
weights: []
|
weights: []
|
||||||
|
- serializedVersion: 2
|
||||||
|
name: oh it's the little guy. you found him
|
||||||
|
rect:
|
||||||
|
serializedVersion: 2
|
||||||
|
x: 1143
|
||||||
|
y: 1591
|
||||||
|
width: 16
|
||||||
|
height: 49
|
||||||
|
alignment: 0
|
||||||
|
pivot: {x: 0, y: 0}
|
||||||
|
border: {x: 0, y: 0, z: 0, w: 0}
|
||||||
|
outline: []
|
||||||
|
physicsShape: []
|
||||||
|
tessellationDetail: 0
|
||||||
|
bones: []
|
||||||
|
spriteID: 4cd68dea3c30b1f48bcd6dd5ad0fffa5
|
||||||
|
internalID: 1314131981
|
||||||
|
vertices: []
|
||||||
|
indices:
|
||||||
|
edges: []
|
||||||
|
weights: []
|
||||||
outline: []
|
outline: []
|
||||||
physicsShape: []
|
physicsShape: []
|
||||||
bones: []
|
bones: []
|
||||||
|
|
@ -763,6 +784,7 @@ TextureImporter:
|
||||||
Ball_Full: 8158683621920566786
|
Ball_Full: 8158683621920566786
|
||||||
Ball_Left: -5925680740112638021
|
Ball_Left: -5925680740112638021
|
||||||
Ball_Right: -5567381644477528568
|
Ball_Right: -5567381644477528568
|
||||||
|
DogNinja_OtherObjects_0: -1593653543
|
||||||
Idol_Full: 2196219148037962045
|
Idol_Full: 2196219148037962045
|
||||||
Idol_Left: -130797512336752496
|
Idol_Left: -130797512336752496
|
||||||
Idol_Right: 8490305602720712907
|
Idol_Right: 8490305602720712907
|
||||||
|
|
@ -783,6 +805,7 @@ TextureImporter:
|
||||||
WildBreath_Full: 2053246660185171032
|
WildBreath_Full: 2053246660185171032
|
||||||
WildBreath_Left: -7594402133338608887
|
WildBreath_Left: -7594402133338608887
|
||||||
WildBreath_Right: 3508372842914876614
|
WildBreath_Right: 3508372842914876614
|
||||||
|
oh it's the little guy. you found him: 1314131981
|
||||||
spritePackingTag:
|
spritePackingTag:
|
||||||
pSDRemoveMatte: 0
|
pSDRemoveMatte: 0
|
||||||
pSDShowRemoveMatteOption: 0
|
pSDShowRemoveMatteOption: 0
|
||||||
|
|
|
||||||
|
|
@ -65,7 +65,7 @@ namespace HeavenStudio.Games.Loaders
|
||||||
{
|
{
|
||||||
function = delegate {
|
function = delegate {
|
||||||
if (eventCaller.gameManager.minigameObj.TryGetComponent(out DogNinja instance)) {
|
if (eventCaller.gameManager.minigameObj.TryGetComponent(out DogNinja instance)) {
|
||||||
instance.DoPrepare(eventCaller.currentEntity.beat);
|
instance.DoPrepare();
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
defaultLength = 0.5f,
|
defaultLength = 0.5f,
|
||||||
|
|
@ -109,16 +109,14 @@ namespace HeavenStudio.Games.Loaders
|
||||||
},
|
},
|
||||||
new GameAction("HereWeGo", "Here We Go!")
|
new GameAction("HereWeGo", "Here We Go!")
|
||||||
{
|
{
|
||||||
function = delegate { DogNinja.HereWeGo(eventCaller.currentEntity.beat); },
|
preFunction = delegate { DogNinja.HereWeGo(eventCaller.currentEntity.beat); },
|
||||||
inactiveFunction = delegate { DogNinja.HereWeGo(eventCaller.currentEntity.beat); },
|
|
||||||
defaultLength = 2,
|
defaultLength = 2,
|
||||||
preFunctionLength = 1,
|
preFunctionLength = 1,
|
||||||
},
|
},
|
||||||
}
|
},
|
||||||
// ,
|
new List<string>() { "ntr", "normal" },
|
||||||
// new List<string>() { "ntr", "normal" },
|
"ntrninja", "en",
|
||||||
// "ntrninja", "en",
|
new List<string>() { }
|
||||||
// new List<string>() { }
|
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -130,7 +128,7 @@ namespace HeavenStudio.Games
|
||||||
using Scripts_DogNinja;
|
using Scripts_DogNinja;
|
||||||
public class DogNinja : Minigame
|
public class DogNinja : Minigame
|
||||||
{
|
{
|
||||||
struct QueuedThrow
|
private struct QueuedThrow
|
||||||
{
|
{
|
||||||
public int[] types;
|
public int[] types;
|
||||||
public string sfxNumL, sfxNumR;
|
public string sfxNumL, sfxNumR;
|
||||||
|
|
@ -223,11 +221,13 @@ namespace HeavenStudio.Games
|
||||||
foreach (var e in gameManager.Beatmap.Entities.FindAll(e => e.datamodel is "dogNinja/ThrowObject" && beat >= e.beat - 2 && beat < e.beat + 1))
|
foreach (var e in gameManager.Beatmap.Entities.FindAll(e => e.datamodel is "dogNinja/ThrowObject" && beat >= e.beat - 2 && beat < e.beat + 1))
|
||||||
{
|
{
|
||||||
QueuedThrow t = e["throwData"];
|
QueuedThrow t = e["throwData"];
|
||||||
|
bool shouldPrepare = e["shouldPrepare"];
|
||||||
if (beat > e.beat) {
|
if (beat > e.beat) {
|
||||||
|
shouldPrepare = false;
|
||||||
DogAnim.Play("Prepare", 0, 1);
|
DogAnim.Play("Prepare", 0, 1);
|
||||||
preparing = true;
|
preparing = true;
|
||||||
}
|
}
|
||||||
ThrowObject(e.beat, e["direction"], ((beat <= e.beat) && e["shouldPrepare"]), t.types, t.sfxNumL, t.sfxNumR);
|
ThrowObject(e.beat, e["direction"], shouldPrepare, t.types, t.sfxNumL, t.sfxNumR);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -349,16 +349,22 @@ namespace HeavenStudio.Games
|
||||||
queuePrepare = false;
|
queuePrepare = false;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void DoPrepare(double beat)
|
public void DoPrepare()
|
||||||
{
|
{
|
||||||
if (PlayerInput.CurrentControlStyle == InputController.ControlStyles.Touch && PlayerInput.PlayerHasControl()) return;
|
if (PlayerInput.CurrentControlStyle == InputController.ControlStyles.Touch && PlayerInput.PlayerHasControl()) return;
|
||||||
if (!queuePrepare) DogAnim.DoScaledAnimationAsync("Prepare", 0.5f);
|
DogAnim.DoScaledAnimationAsync("Prepare", 0.5f);
|
||||||
queuePrepare = true;
|
preparing = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
public static void HereWeGo(double beat)
|
public static void HereWeGo(double beat)
|
||||||
{
|
{
|
||||||
PlaySoundSequence("dogNinja", "here_we_go", beat);
|
// // sound sequence isn't working?
|
||||||
|
// PlaySoundSequence("dogNinja", "here_we_go", beat);
|
||||||
|
MultiSound.Play(new List<MultiSound.Sound>() {
|
||||||
|
new("dogNinja/here", beat + 0),
|
||||||
|
new("dogNinja/we", beat + 0.5),
|
||||||
|
new("dogNinja/go", beat + 1),
|
||||||
|
}, forcePlay: true);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -88,7 +88,6 @@ namespace HeavenStudio.Games.Scripts_DogNinja
|
||||||
DogAnim.DoScaledAnimationAsync("Slice" + dir, 0.5f);
|
DogAnim.DoScaledAnimationAsync("Slice" + dir, 0.5f);
|
||||||
if (shouldSfx) SoundByte.PlayOneShotGame(sfxNum + "2");
|
if (shouldSfx) SoundByte.PlayOneShotGame(sfxNum + "2");
|
||||||
|
|
||||||
Debug.Log("type - 1 : " + (type - 1));
|
|
||||||
HalvesLeftBase.sr.sprite = objectLeftHalves[type - 1];
|
HalvesLeftBase.sr.sprite = objectLeftHalves[type - 1];
|
||||||
HalvesRightBase.sr.sprite = objectRightHalves[type - 1];
|
HalvesRightBase.sr.sprite = objectRightHalves[type - 1];
|
||||||
for (int i = 0; i < 2; i++) {
|
for (int i = 0; i < 2; i++) {
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue