Karateka Fix, Sneaky Spirits
Fix a smol bug with the face change delay, to compensate for that, I also added the ability to trigger the game delay mods as an inactive function. Add Sneaky Spirits sounds
This commit is contained in:
parent
78afd06693
commit
564391bcd9
|
@ -5102,6 +5102,7 @@ GameObject:
|
|||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 7783755712010897486}
|
||||
- component: {fileID: 4154659286214031338}
|
||||
m_Layer: 0
|
||||
m_Name: Spirit
|
||||
m_TagString: Untagged
|
||||
|
@ -5123,6 +5124,31 @@ Transform:
|
|||
m_Father: {fileID: 7380707858405245991}
|
||||
m_RootOrder: 0
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!114 &4154659286214031338
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 5629288301496021772}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 2a9f5c770dfec4949a3bf16442deee66, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
inList: 0
|
||||
state:
|
||||
gameObject: {fileID: 0}
|
||||
early: 0
|
||||
perfect: 0
|
||||
late: 0
|
||||
createBeat: 0
|
||||
eligibleHitsList: []
|
||||
aceTimes: 0
|
||||
isEligible: 0
|
||||
triggersAutoplay: 1
|
||||
startBeat: 0
|
||||
numBeats: 0
|
||||
--- !u!1 &5877611500169024775
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
|
@ -3,5 +3,5 @@ guid: cb54a946beab7a547af9796194858fd3
|
|||
PrefabImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleName: agbghost/common
|
||||
assetBundleVariant:
|
||||
|
|
8
Assets/Resources/Sfx/games/sneakySpirits.meta
Normal file
8
Assets/Resources/Sfx/games/sneakySpirits.meta
Normal file
|
@ -0,0 +1,8 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 330d5e5043d46934caeaebf68af807c8
|
||||
folderAsset: yes
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName: agbghost/common
|
||||
assetBundleVariant:
|
BIN
Assets/Resources/Sfx/games/sneakySpirits/fading1.ogg
Normal file
BIN
Assets/Resources/Sfx/games/sneakySpirits/fading1.ogg
Normal file
Binary file not shown.
22
Assets/Resources/Sfx/games/sneakySpirits/fading1.ogg.meta
Normal file
22
Assets/Resources/Sfx/games/sneakySpirits/fading1.ogg.meta
Normal file
|
@ -0,0 +1,22 @@
|
|||
fileFormatVersion: 2
|
||||
guid: fb220b26e79453a48b4104f3ebb61ae4
|
||||
AudioImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 6
|
||||
defaultSettings:
|
||||
loadType: 0
|
||||
sampleRateSetting: 0
|
||||
sampleRateOverride: 44100
|
||||
compressionFormat: 1
|
||||
quality: 1
|
||||
conversionMode: 0
|
||||
platformSettingOverrides: {}
|
||||
forceToMono: 0
|
||||
normalize: 1
|
||||
preloadAudioData: 1
|
||||
loadInBackground: 0
|
||||
ambisonic: 0
|
||||
3D: 1
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
BIN
Assets/Resources/Sfx/games/sneakySpirits/fading2.ogg
Normal file
BIN
Assets/Resources/Sfx/games/sneakySpirits/fading2.ogg
Normal file
Binary file not shown.
22
Assets/Resources/Sfx/games/sneakySpirits/fading2.ogg.meta
Normal file
22
Assets/Resources/Sfx/games/sneakySpirits/fading2.ogg.meta
Normal file
|
@ -0,0 +1,22 @@
|
|||
fileFormatVersion: 2
|
||||
guid: ef677526695f569439862c9f897b6f12
|
||||
AudioImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 6
|
||||
defaultSettings:
|
||||
loadType: 0
|
||||
sampleRateSetting: 0
|
||||
sampleRateOverride: 44100
|
||||
compressionFormat: 1
|
||||
quality: 1
|
||||
conversionMode: 0
|
||||
platformSettingOverrides: {}
|
||||
forceToMono: 0
|
||||
normalize: 1
|
||||
preloadAudioData: 1
|
||||
loadInBackground: 0
|
||||
ambisonic: 0
|
||||
3D: 1
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
BIN
Assets/Resources/Sfx/games/sneakySpirits/fading3.ogg
Normal file
BIN
Assets/Resources/Sfx/games/sneakySpirits/fading3.ogg
Normal file
Binary file not shown.
22
Assets/Resources/Sfx/games/sneakySpirits/fading3.ogg.meta
Normal file
22
Assets/Resources/Sfx/games/sneakySpirits/fading3.ogg.meta
Normal file
|
@ -0,0 +1,22 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 2d7fbf7112444864ea5cf82dd09ce1c4
|
||||
AudioImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 6
|
||||
defaultSettings:
|
||||
loadType: 0
|
||||
sampleRateSetting: 0
|
||||
sampleRateOverride: 44100
|
||||
compressionFormat: 1
|
||||
quality: 1
|
||||
conversionMode: 0
|
||||
platformSettingOverrides: {}
|
||||
forceToMono: 0
|
||||
normalize: 1
|
||||
preloadAudioData: 1
|
||||
loadInBackground: 0
|
||||
ambisonic: 0
|
||||
3D: 1
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
BIN
Assets/Resources/Sfx/games/sneakySpirits/hit.ogg
Normal file
BIN
Assets/Resources/Sfx/games/sneakySpirits/hit.ogg
Normal file
Binary file not shown.
22
Assets/Resources/Sfx/games/sneakySpirits/hit.ogg.meta
Normal file
22
Assets/Resources/Sfx/games/sneakySpirits/hit.ogg.meta
Normal file
|
@ -0,0 +1,22 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 4cc78bb5d96490b44839536f90fa4d39
|
||||
AudioImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 6
|
||||
defaultSettings:
|
||||
loadType: 0
|
||||
sampleRateSetting: 0
|
||||
sampleRateOverride: 44100
|
||||
compressionFormat: 1
|
||||
quality: 1
|
||||
conversionMode: 0
|
||||
platformSettingOverrides: {}
|
||||
forceToMono: 0
|
||||
normalize: 1
|
||||
preloadAudioData: 1
|
||||
loadInBackground: 0
|
||||
ambisonic: 0
|
||||
3D: 1
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
BIN
Assets/Resources/Sfx/games/sneakySpirits/moving.ogg
Normal file
BIN
Assets/Resources/Sfx/games/sneakySpirits/moving.ogg
Normal file
Binary file not shown.
22
Assets/Resources/Sfx/games/sneakySpirits/moving.ogg.meta
Normal file
22
Assets/Resources/Sfx/games/sneakySpirits/moving.ogg.meta
Normal file
|
@ -0,0 +1,22 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 8898be755d1632c4a869c462a09b01b6
|
||||
AudioImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 6
|
||||
defaultSettings:
|
||||
loadType: 0
|
||||
sampleRateSetting: 0
|
||||
sampleRateOverride: 44100
|
||||
compressionFormat: 1
|
||||
quality: 1
|
||||
conversionMode: 0
|
||||
platformSettingOverrides: {}
|
||||
forceToMono: 0
|
||||
normalize: 1
|
||||
preloadAudioData: 1
|
||||
loadInBackground: 0
|
||||
ambisonic: 0
|
||||
3D: 1
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
BIN
Assets/Resources/Sfx/games/sneakySpirits/now.ogg
Normal file
BIN
Assets/Resources/Sfx/games/sneakySpirits/now.ogg
Normal file
Binary file not shown.
22
Assets/Resources/Sfx/games/sneakySpirits/now.ogg.meta
Normal file
22
Assets/Resources/Sfx/games/sneakySpirits/now.ogg.meta
Normal file
|
@ -0,0 +1,22 @@
|
|||
fileFormatVersion: 2
|
||||
guid: b8f15f55a461d6b4a878b8130bcb0ae6
|
||||
AudioImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 6
|
||||
defaultSettings:
|
||||
loadType: 0
|
||||
sampleRateSetting: 0
|
||||
sampleRateOverride: 44100
|
||||
compressionFormat: 1
|
||||
quality: 1
|
||||
conversionMode: 0
|
||||
platformSettingOverrides: {}
|
||||
forceToMono: 0
|
||||
normalize: 1
|
||||
preloadAudioData: 1
|
||||
loadInBackground: 0
|
||||
ambisonic: 0
|
||||
3D: 1
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
BIN
Assets/Resources/Sfx/games/sneakySpirits/rainLoop.ogg
Normal file
BIN
Assets/Resources/Sfx/games/sneakySpirits/rainLoop.ogg
Normal file
Binary file not shown.
22
Assets/Resources/Sfx/games/sneakySpirits/rainLoop.ogg.meta
Normal file
22
Assets/Resources/Sfx/games/sneakySpirits/rainLoop.ogg.meta
Normal file
|
@ -0,0 +1,22 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 6d2f6a2840263d647ac2eed9890e0235
|
||||
AudioImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 6
|
||||
defaultSettings:
|
||||
loadType: 0
|
||||
sampleRateSetting: 0
|
||||
sampleRateOverride: 44100
|
||||
compressionFormat: 1
|
||||
quality: 1
|
||||
conversionMode: 0
|
||||
platformSettingOverrides: {}
|
||||
forceToMono: 0
|
||||
normalize: 1
|
||||
preloadAudioData: 1
|
||||
loadInBackground: 0
|
||||
ambisonic: 0
|
||||
3D: 1
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
BIN
Assets/Resources/Sfx/games/sneakySpirits/silence.ogg
Normal file
BIN
Assets/Resources/Sfx/games/sneakySpirits/silence.ogg
Normal file
Binary file not shown.
22
Assets/Resources/Sfx/games/sneakySpirits/silence.ogg.meta
Normal file
22
Assets/Resources/Sfx/games/sneakySpirits/silence.ogg.meta
Normal file
|
@ -0,0 +1,22 @@
|
|||
fileFormatVersion: 2
|
||||
guid: a3b2de74ffdf0b244b7c978891b59fb1
|
||||
AudioImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 6
|
||||
defaultSettings:
|
||||
loadType: 0
|
||||
sampleRateSetting: 0
|
||||
sampleRateOverride: 44100
|
||||
compressionFormat: 1
|
||||
quality: 1
|
||||
conversionMode: 0
|
||||
platformSettingOverrides: {}
|
||||
forceToMono: 0
|
||||
normalize: 1
|
||||
preloadAudioData: 1
|
||||
loadInBackground: 0
|
||||
ambisonic: 0
|
||||
3D: 1
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
|
@ -4,5 +4,5 @@ folderAsset: yes
|
|||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleName: agbghost/common
|
||||
assetBundleVariant:
|
||||
|
|
|
@ -142,7 +142,8 @@ namespace HeavenStudio.Games.Loaders
|
|||
new Param("valA", new EntityTypes.Float(0f, 10f, 1f), "Pot Break Delay", "Sets the pot break delay, 1.5 is Tengoku Arcade delay"),
|
||||
new Param("valB", new EntityTypes.Float(0f, 10f, 0.5f), "Oh Yeah Delay", "Sets the pot break delay, a delay of 0 is Tengoku Arcade delay"),
|
||||
new Param("valC", new EntityTypes.Float(0f, 10f, 1f), "Face Change Delay", "The face change delay when you punch and object and your face changes")
|
||||
}
|
||||
},
|
||||
inactiveFunction = delegate { var e = eventCaller.currentEntity; KarateMan.instance.SetDelay(e["valA"], e["valB"], e["valC"]); }
|
||||
},
|
||||
new GameAction("set background effects", "Background Appearance")
|
||||
{
|
||||
|
|
|
@ -837,7 +837,7 @@ namespace HeavenStudio.Games.Scripts_KarateMan
|
|||
joe.SetFaceExpression((int) KarateMan.KarateManFaces.Sad);
|
||||
BeatAction.New(joe.gameObject, new List<BeatAction.Action>()
|
||||
{
|
||||
new BeatAction.Action(startBeat + 1f + KarateMan.FaceChangeDelay, delegate {
|
||||
new BeatAction.Action(startBeat + 2f, delegate {
|
||||
joe.SetFaceExpression((int) KarateMan.KarateManFaces.Normal);
|
||||
}),
|
||||
});
|
||||
|
@ -868,7 +868,7 @@ namespace HeavenStudio.Games.Scripts_KarateMan
|
|||
bool straight = joe.Punch(ItemPunchHand());
|
||||
KarateMan.instance.ActivateHonki(startBeat, honkiMode, honkiSound);
|
||||
transform.rotation = Quaternion.Euler(0, 0, transform.rotation.eulerAngles.z - 30f);
|
||||
DoHitExpression(startBeat + 2f);
|
||||
DoHitExpression(startBeat + 1f + KarateMan.FaceChangeDelay);
|
||||
ItemHitEffect(straight);
|
||||
status = FlyStatus.Hit;
|
||||
KarateMan.instance.Nori.DoHit(startBeat);
|
||||
|
|
|
@ -58,14 +58,13 @@ namespace HeavenStudio.Games
|
|||
|
||||
public void SpawnSpirit(float beat, int length)
|
||||
{
|
||||
CreateSpirit(beat, length);//, )
|
||||
CreateSpirit(beat, length);
|
||||
}
|
||||
|
||||
public GameObject CreateSpirit(float beat, int length)//, string awakeAnim)
|
||||
public GameObject CreateSpirit(float beat, int length)
|
||||
{
|
||||
GameObject mobj = GameObject.Instantiate(SneakySpirit, SpawnRoot);
|
||||
WahSpirits mobjDat = mobj.GetComponent<WahSpirits>();
|
||||
|
||||
mobjDat.startBeat = beat;
|
||||
mobjDat.numBeats = length;
|
||||
|
||||
|
|
Binary file not shown.
|
@ -1,5 +1,5 @@
|
|||
ManifestFileVersion: 0
|
||||
CRC: 2037689995
|
||||
CRC: 815852521
|
||||
AssetBundleManifest:
|
||||
AssetBundleInfos:
|
||||
Info_0:
|
||||
|
@ -165,3 +165,6 @@ AssetBundleManifest:
|
|||
Info_51:
|
||||
Name: ctrcatchy/common
|
||||
Dependencies: {}
|
||||
Info_52:
|
||||
Name: agbghost/common
|
||||
Dependencies: {}
|
||||
|
|
Binary file not shown.
|
@ -1,12 +1,12 @@
|
|||
ManifestFileVersion: 0
|
||||
CRC: 262531012
|
||||
CRC: 1873177332
|
||||
Hashes:
|
||||
AssetFileHash:
|
||||
serializedVersion: 2
|
||||
Hash: 886f9fe528ba83c8f2bc8d7e7387d1de
|
||||
Hash: 9052c798106e87f214b20f98acd5ed94
|
||||
TypeTreeHash:
|
||||
serializedVersion: 2
|
||||
Hash: 70abb57e477e27445603580cc67eb7e6
|
||||
Hash: a13a5847eb9c6077ad7ed49f7c278395
|
||||
HashAppended: 0
|
||||
ClassTypes:
|
||||
- Class: 1
|
||||
|
@ -21,6 +21,8 @@ ClassTypes:
|
|||
Script: {instanceID: 0}
|
||||
- Class: 74
|
||||
Script: {instanceID: 0}
|
||||
- Class: 83
|
||||
Script: {instanceID: 0}
|
||||
- Class: 91
|
||||
Script: {instanceID: 0}
|
||||
- Class: 95
|
||||
|
@ -41,10 +43,18 @@ SerializeReferenceClassIdentifiers: []
|
|||
Assets:
|
||||
- Assets/Resources/Sprites/Games/SneakySpirits/Epilouge.png
|
||||
- Assets/Resources/Sprites/Games/SneakySpirits/Animations/Tree.anim
|
||||
- Assets/Resources/Sfx/games/sneakySpirits/rainLoop.ogg
|
||||
- Assets/Resources/Sfx/games/sneakySpirits/moving.ogg
|
||||
- Assets/Resources/Games/sneakySpirits.prefab
|
||||
- Assets/Resources/Sprites/Games/SneakySpirits/SneakySpirits.png
|
||||
- Assets/Resources/Sprites/Games/SneakySpirits/Animations/Tree_1.controller
|
||||
- Assets/Resources/Sfx/games/sneakySpirits/fading1.ogg
|
||||
- Assets/Resources/Sfx/games/sneakySpirits/now.ogg
|
||||
- Assets/Resources/Sfx/games/sneakySpirits/hit.ogg
|
||||
- Assets/Resources/Sfx/games/sneakySpirits/fading2.ogg
|
||||
- Assets/Resources/Sprites/Games/SneakySpirits/Animations/New Animation.anim
|
||||
- Assets/Resources/Sprites/Games/SneakySpirits/Prolouge.png
|
||||
- Assets/Resources/Sprites/Games/SneakySpirits/Title.png
|
||||
- Assets/Resources/Sfx/games/sneakySpirits/fading3.ogg
|
||||
- Assets/Resources/Sfx/games/sneakySpirits/silence.ogg
|
||||
Dependencies: []
|
||||
|
|
Loading…
Reference in a new issue