Lifting Locales, Pati Pati Attempt, Karateka

Adds Korean Karateka, adds Lifitng Locales, with an attempt to make non-infinite angry face in Clappy Trio.
This commit is contained in:
Amy54Desu 2022-12-13 20:03:49 -05:00
parent 13d2bf60ba
commit 15a2862f58
133 changed files with 1210 additions and 290 deletions

View file

@ -1,5 +1,5 @@
ManifestFileVersion: 0
CRC: 1771756940
CRC: 237503574
AssetBundleManifest:
AssetBundleInfos:
Info_0:
@ -51,11 +51,11 @@ AssetBundleManifest:
Name: rvlbadminton/common
Dependencies: {}
Info_16:
Name: ntrlifting/common
Dependencies: {}
Info_17:
Name: ntrlifting/locale.en
Dependencies: {}
Info_18:
Name: ntrlifting/locale.jp
Dependencies: {}
Info_17:
Name: ntrlifting/common
Dependencies: {}
Info_18:
Name: ntrlifting/locale.en
Dependencies: {}

View file

@ -1,9 +1,9 @@
ManifestFileVersion: 0
CRC: 550471145
CRC: 3495726078
Hashes:
AssetFileHash:
serializedVersion: 2
Hash: acb9671345ae9607e46086f39e0c4f55
Hash: fd68986f1eab160bf07aa5705ceb1c9e
TypeTreeHash:
serializedVersion: 2
Hash: 9a2ca7bdbd1871f7131daf57de908e0c
@ -13,7 +13,6 @@ ClassTypes:
Script: {instanceID: 0}
SerializeReferenceClassIdentifiers: []
Assets:
- Assets/Resources/Sfx/games/marchingOrders/march2.ogg
- Assets/Resources/Sfx/games/marchingOrders/turnAction.ogg
- Assets/Resources/Sfx/games/marchingOrders/marchStart.ogg
- Assets/Resources/Sfx/games/marchingOrders/step1.ogg
Dependencies: []

View file

@ -1,12 +1,12 @@
ManifestFileVersion: 0
CRC: 3200806702
CRC: 1624589987
Hashes:
AssetFileHash:
serializedVersion: 2
Hash: 441a76d26350c944bb7fee76d02288e5
Hash: 2e4b05877aad3de1c1f960e6d5f669b5
TypeTreeHash:
serializedVersion: 2
Hash: 2b92e6f111bbb24dabe3a2c56ea02b28
Hash: 4dc83e2b35ad62bed4e41f3ad2721117
HashAppended: 0
ClassTypes:
- Class: 1
@ -81,7 +81,9 @@ SerializeReferenceClassIdentifiers:
- AssemblyName: UnityEngine.UI
ClassName: UnityEngine.UI.MaskableGraphic/CullStateChangedEvent
Assets:
- Assets/Resources/Sprites/Games/KarateMan/anime/word/Word03ko.anim
- Assets/Resources/Sprites/Games/KarateMan/karate_bg_rings_2.png
- Assets/Resources/Sprites/Games/KarateMan/karate_bg_recolorable_seriousmode.png
- Assets/Resources/Sprites/Games/KarateMan/effect/krt_rock.mat
- Assets/Resources/Sprites/Games/KarateMan/effect/fire.png
- Assets/Resources/Sprites/Games/KarateMan/anime/karateman/ToReady.anim
@ -95,6 +97,7 @@ Assets:
- Assets/Resources/Sfx/games/karateman/nori_ng.wav
- Assets/Resources/Sprites/Games/KarateMan/effect/potStar.png
- Assets/Resources/Sprites/Games/KarateMan/effect/kickFragment.png
- Assets/Resources/Sprites/Games/KarateMan/anime/word/Word02ko.anim
- Assets/Resources/Sfx/games/karateman/swingKick.wav
- Assets/Resources/Sprites/Games/KarateMan/effect/barrelWood.png
- Assets/Resources/Sfx/games/karateman/gogo.ogg
@ -123,6 +126,7 @@ Assets:
- Assets/Resources/Sprites/Games/KarateMan/anime/overlay/NoriNone.anim
- Assets/Resources/Sprites/Games/KarateMan/anime/karateman/NoPose.anim
- Assets/Resources/Sprites/Games/KarateMan/anime/karateman/Jab.anim
- Assets/Resources/Sprites/Games/KarateMan/anime/word/Word06jp.anim
- Assets/Resources/Sprites/Games/KarateMan/anime/karateman/Head/Face04.anim
- Assets/Resources/Sfx/games/karateman/rockHit.ogg
- Assets/Resources/Sfx/games/karateman/punchKickHit1.ogg
@ -133,13 +137,16 @@ Assets:
- Assets/Resources/Sfx/games/karateman/comboHit2.ogg
- Assets/Resources/Sprites/Games/KarateMan/anime/karateman/LowJab.anim
- Assets/Resources/Sprites/Games/KarateMan/karateman_cellshader.mat
- Assets/Resources/Sprites/Games/KarateMan/anime/word/Word01jp.anim
- Assets/Resources/Sprites/Games/KarateMan/anime/word/Word04.anim
- Assets/Resources/Sprites/Games/KarateMan/karate_bg_sunburst_2.png
- Assets/Resources/Sprites/Games/KarateMan/anime/word/Word05jp.anim
- Assets/Resources/Sprites/Games/KarateMan/karateman_nonurijab.mat
- Assets/Resources/Sfx/games/karateman/rockHit_fullNori.wav
- Assets/Resources/Sfx/games/karateman/lightbulbOut.ogg
- Assets/Resources/Sprites/Games/KarateMan/anime/word/Word06.anim
- Assets/Resources/Sprites/Games/KarateMan/anime/word/Word00ko.anim
- Assets/Resources/Sprites/Games/KarateMan/anime/item/Item08.anim
- Assets/Resources/Sprites/Games/KarateMan/anime/word/Word06.anim
- Assets/Resources/Sprites/Games/KarateMan/karate_bg_gradient.png
- Assets/Resources/Sprites/Games/KarateMan/effect/impact.png
- Assets/Resources/Sprites/Games/KarateMan/effect/barrelParts00.png
@ -168,38 +175,48 @@ Assets:
- Assets/Resources/Sprites/Games/KarateMan/anime/karateman/Head/Face02.anim
- Assets/Resources/Sprites/Games/KarateMan/karate_bg_radial.png
- Assets/Resources/Sprites/Games/KarateMan/effect/karateman_bulbhit_fx_1.png
- Assets/Resources/Sprites/Games/KarateMan/anime/word/Word05ko.anim
- Assets/Resources/Sprites/Games/KarateMan/karateman_norimapping.mat
- Assets/Resources/Sprites/Games/KarateMan/anime/karateman/UpperCut.anim
- Assets/Resources/Sfx/games/karateman/potHit_lowNori.wav
- Assets/Resources/Sprites/Games/KarateMan/anime/item/HitMark.controller
- Assets/Resources/Sfx/games/karateman/lightbulbHit.ogg
- Assets/Resources/Sprites/Games/KarateMan/effect/krt_pot.mat
- Assets/Resources/Sprites/Games/KarateMan/anime/word/Word03jp.anim
- Assets/Resources/Sprites/Games/KarateMan/anime/item/HitMark.anim
- Assets/Resources/Sprites/Games/KarateMan/effect/rockEmitter.png
- Assets/Resources/Sprites/Games/KarateMan/effect/krt_pot.mat
- Assets/Resources/Sfx/games/karateman/objectOut.ogg
- Assets/Resources/Sprites/Games/KarateMan/effect/rockEmitter.png
- Assets/Resources/Sfx/games/karateman/barrelOutCombos.ogg
- Assets/Resources/Sprites/Games/KarateMan/anime/item/Item04.anim
- Assets/Resources/Sfx/games/karateman/comboHit3.ogg
- Assets/Resources/Sprites/Games/KarateMan/anime/word/Word01ko.anim
- Assets/Resources/Sprites/Games/KarateMan/karate_bg_bloody.png
- Assets/Resources/Sfx/games/karateman/cookingPot.ogg
- Assets/Resources/Sprites/Games/KarateMan/anime/karateman/Head/Face01.anim
- Assets/Resources/Sprites/Games/KarateMan/karateman_overlays.png
- Assets/Resources/Sprites/Games/KarateMan/anime/word/Word01.anim
- Assets/Resources/Sprites/Games/KarateMan/anime/word/Word04jp.anim
- Assets/Resources/Sprites/Games/KarateMan/anime/word/Word07jp.anim
- Assets/Resources/Sfx/games/karateman/barrelOutKicks.ogg
- Assets/Resources/Sfx/games/karateman/bombKick.ogg
- Assets/Resources/Sprites/Games/KarateMan/anime/item/Item01.anim
- Assets/Resources/Sprites/Games/KarateMan/anime/word/Word02.anim
- Assets/Resources/Sfx/games/karateman/alienHit.ogg
- Assets/Resources/Sprites/Games/KarateMan/karate_bg_seriousmode_1.png
- Assets/Resources/Sprites/Games/KarateMan/anime/bg/Rings.anim
- Assets/Resources/Sprites/Games/KarateMan/anime/word/Word00jp.anim
- Assets/Resources/Sfx/games/karateman/comboHit4.ogg
- Assets/Resources/Sprites/Games/KarateMan/anime/karateman/Head/KarateManHead.controller
- Assets/Resources/Sprites/Games/KarateMan/anime/item/Item06.anim
- Assets/Resources/Sprites/Games/KarateMan/anime/karateman/KarateMan.controller
- Assets/Resources/Sprites/Games/KarateMan/anime/word/Word02jp.anim
- Assets/Resources/Sprites/Games/KarateMan/effect/barrelParts01.png
- Assets/Resources/Sfx/games/karateman/punchKickHit2.ogg
- Assets/Resources/Sprites/Games/KarateMan/anime/word/Word04ko.anim
- Assets/Resources/Sprites/Games/KarateMan/effect/other.png
- Assets/Resources/Sprites/Games/KarateMan/anime/karateman/BackHand.anim
- Assets/Resources/Sprites/Games/KarateMan/anime/karateman/Straight.anim
- Assets/Resources/Sprites/Games/KarateMan/anime/word/Word07ko.anim
- Assets/Resources/Sprites/Games/KarateMan/anime/karateman/Head/Face07.anim
- Assets/Resources/Sfx/games/karateman/lightbulbBreak.ogg
- Assets/Resources/Sprites/Games/KarateMan/anime/item/Item02.anim
@ -209,4 +226,6 @@ Assets:
- Assets/Resources/Sfx/games/karateman/soccerHit.ogg
- Assets/Resources/Sprites/Games/KarateMan/karateman_bulb_light.png
- Assets/Resources/Sprites/Games/KarateMan/anime/karateman/Head/Face00.anim
- Assets/Resources/Sprites/Games/KarateMan/karate_bg_seriousmode_2.png
- Assets/Resources/Sprites/Games/KarateMan/anime/word/Word06ko.anim
Dependencies: []

View file

@ -1,9 +1,9 @@
ManifestFileVersion: 0
CRC: 282233702
CRC: 1697884018
Hashes:
AssetFileHash:
serializedVersion: 2
Hash: 20c0bb0f144ef793bda24fdef430d30d
Hash: 3c9dabd00bb8c06a5da46b1a08d4b869
TypeTreeHash:
serializedVersion: 2
Hash: 9a2ca7bdbd1871f7131daf57de908e0c
@ -13,8 +13,10 @@ ClassTypes:
Script: {instanceID: 0}
SerializeReferenceClassIdentifiers: []
Assets:
- Assets/Resources/Sfx/games/karateman/en/punchKick2.ogg
- Assets/Resources/Sfx/games/karateman/en/punchKick4.ogg
- Assets/Resources/Sfx/games/karateman/en/one.ogg
- Assets/Resources/Sfx/games/karateman/en/threePitch.ogg
- Assets/Resources/Sfx/games/karateman/en/punchy2.ogg
- Assets/Resources/Sfx/games/karateman/en/threeAlt.wav
- Assets/Resources/Sfx/games/karateman/en/hitAlt.wav
@ -29,5 +31,5 @@ Assets:
- Assets/Resources/Sfx/games/karateman/en/punchy4.ogg
- Assets/Resources/Sfx/games/karateman/en/hit.ogg
- Assets/Resources/Sfx/games/karateman/en/three.ogg
- Assets/Resources/Sfx/games/karateman/en/punchKick2.ogg
- Assets/Resources/Sfx/games/karateman/en/punchKickPitch.ogg
Dependencies: []

View file

@ -1,9 +1,9 @@
ManifestFileVersion: 0
CRC: 1930453414
CRC: 128770303
Hashes:
AssetFileHash:
serializedVersion: 2
Hash: 37108ac2bca9b98161ac1ab29d0265d1
Hash: cfe1a5372a5ff9a753cd37fc6ed3a4fb
TypeTreeHash:
serializedVersion: 2
Hash: 9a2ca7bdbd1871f7131daf57de908e0c
@ -13,20 +13,21 @@ ClassTypes:
Script: {instanceID: 0}
SerializeReferenceClassIdentifiers: []
Assets:
- Assets/Resources/Sfx/games/karateman/jp/hit.ogg
- Assets/Resources/Sfx/games/karateman/jp/hitAlt.ogg
- Assets/Resources/Sfx/games/karateman/jp/punchKick4.ogg
- Assets/Resources/Sfx/games/karateman/jp/punchy4.ogg
- Assets/Resources/Sfx/games/karateman/jp/threeAlt.ogg
- Assets/Resources/Sfx/games/karateman/jp/three.ogg
- Assets/Resources/Sfx/games/karateman/jp/four.ogg
- Assets/Resources/Sfx/games/karateman/jp/punchKickPitch.ogg
- Assets/Resources/Sfx/games/karateman/jp/punchKick3.ogg
- Assets/Resources/Sfx/games/karateman/jp/one.ogg
- Assets/Resources/Sfx/games/karateman/jp/punchy1.ogg
- Assets/Resources/Sfx/games/karateman/jp/hitAlt.ogg
- Assets/Resources/Sfx/games/karateman/jp/hit.ogg
- Assets/Resources/Sfx/games/karateman/jp/punchKick1.ogg
- Assets/Resources/Sfx/games/karateman/jp/ko.ogg
- Assets/Resources/Sfx/games/karateman/jp/pow.ogg
- Assets/Resources/Sfx/games/karateman/jp/punchy3.ogg
- Assets/Resources/Sfx/games/karateman/jp/three.ogg
- Assets/Resources/Sfx/games/karateman/jp/threeAlt.ogg
- Assets/Resources/Sfx/games/karateman/jp/punchKick2.ogg
- Assets/Resources/Sfx/games/karateman/jp/threePitch.ogg
- Assets/Resources/Sfx/games/karateman/jp/punchy2.ogg
Dependencies: []

View file

@ -1,9 +1,9 @@
ManifestFileVersion: 0
CRC: 4063891204
CRC: 3226077308
Hashes:
AssetFileHash:
serializedVersion: 2
Hash: c0de7adcdfe0c431e99412509aebf282
Hash: 3148b2092eb5422c7e0a3324af7e79d9
TypeTreeHash:
serializedVersion: 2
Hash: 9a2ca7bdbd1871f7131daf57de908e0c
@ -13,10 +13,14 @@ ClassTypes:
Script: {instanceID: 0}
SerializeReferenceClassIdentifiers: []
Assets:
- Assets/Resources/Sfx/games/karateman/ko/threePitch.ogg
- Assets/Resources/Sfx/games/karateman/ko/punchKickPitch.ogg
- Assets/Resources/Sfx/games/karateman/ko/pow.ogg
- Assets/Resources/Sfx/games/karateman/ko/ko.ogg
- Assets/Resources/Sfx/games/karateman/ko/punchy1.ogg
- Assets/Resources/Sfx/games/karateman/ko/four.ogg
- Assets/Resources/Sfx/games/karateman/ko/hitAlt.ogg
- Assets/Resources/Sfx/games/karateman/ko/threeAlt.ogg
- Assets/Resources/Sfx/games/karateman/ko/punchKick1.ogg
- Assets/Resources/Sfx/games/karateman/ko/punchy3.ogg
- Assets/Resources/Sfx/games/karateman/ko/punchKick4.ogg

View file

@ -1,30 +1,68 @@
ManifestFileVersion: 0
CRC: 4237585548
CRC: 2526773519
Hashes:
AssetFileHash:
serializedVersion: 2
Hash: d2f160fdd75667acbeadef09b25b7d29
Hash: d30e1aac794939aa8540473115652465
TypeTreeHash:
serializedVersion: 2
Hash: 9a2ca7bdbd1871f7131daf57de908e0c
Hash: fd281e67485b327c24c8408f4de7b131
HashAppended: 0
ClassTypes:
- Class: 1
Script: {instanceID: 0}
- Class: 4
Script: {instanceID: 0}
- Class: 21
Script: {instanceID: 0}
- Class: 28
Script: {instanceID: 0}
- Class: 48
Script: {instanceID: 0}
- Class: 74
Script: {instanceID: 0}
- Class: 83
Script: {instanceID: 0}
SerializeReferenceClassIdentifiers: []
- Class: 91
Script: {instanceID: 0}
- Class: 95
Script: {instanceID: 0}
- Class: 114
Script: {fileID: 11500000, guid: 54588eb7ee0680643aeaf61dcf609903, type: 3}
- Class: 114
Script: {fileID: 11500000, guid: 6b323a3095c4c2e4db991ebafc1384cc, type: 3}
- Class: 114
Script: {fileID: 11500000, guid: 924b8b91d38165d49bde41b195970f76, type: 3}
- Class: 114
Script: {fileID: 11500000, guid: 066a41e004f415b4eb74d5e61a2aadbe, type: 3}
- Class: 114
Script: {fileID: 11500000, guid: 45eb7daf344474546ba5079bf18eae01, type: 3}
- Class: 114
Script: {fileID: 11500000, guid: b0cca3244f403c24f819a870f31cdc29, type: 3}
- Class: 114
Script: {fileID: 11500000, guid: 848efddf5f5eaa94eacf8601e36f81bf, type: 3}
- Class: 115
Script: {instanceID: 0}
- Class: 212
Script: {instanceID: 0}
- Class: 213
Script: {instanceID: 0}
SerializeReferenceClassIdentifiers:
- AssemblyName: Assembly-CSharp
ClassName: HeavenStudio.Games.Minigame/Eligible
Assets:
- Assets/Resources/Sfx/games/spaceSoccer/dispenseTumble2.ogg
- Assets/Resources/Sfx/games/spaceSoccer/jetStart.ogg
- Assets/Resources/Games/spaceSoccer.prefab
- Assets/Resources/Sfx/games/spaceSoccer/dispenseTumble6.ogg
- Assets/Resources/Sfx/games/spaceSoccer/dispenseTumble6B.ogg
- Assets/Resources/Sfx/games/spaceSoccer/dispenseTumble2B.ogg
- Assets/Resources/Sfx/games/spaceSoccer/jetLong.ogg
- Assets/Resources/Sfx/games/spaceSoccer/jetSpeedUp.ogg
- Assets/Resources/Sfx/games/spaceSoccer/dispenseTumble1.ogg
- Assets/Resources/Sfx/games/spaceSoccer/dispenseTumble3.ogg
- Assets/Resources/Sfx/games/spaceSoccer/dispenseNoise.ogg
- Assets/Resources/Sfx/games/spaceSoccer/highKickToeBallHit2.ogg
- Assets/Resources/Sfx/games/spaceSoccer/jetShort.ogg
- Assets/Resources/Sfx/games/spaceSoccer/highKickToeBallHit1.ogg
- Assets/Resources/Sfx/games/spaceSoccer/dispenseTumble4.ogg
- Assets/Resources/Sfx/games/spaceSoccer/ballHit.ogg
- Assets/Resources/Sfx/games/spaceSoccer/dispenseTumble5.ogg

View file

@ -1,9 +1,9 @@
ManifestFileVersion: 0
CRC: 1422531284
CRC: 1913121055
Hashes:
AssetFileHash:
serializedVersion: 2
Hash: 17b379647575fb6429f82abf29bca8fb
Hash: ec94171611ab457abe262db4ace553c7
TypeTreeHash:
serializedVersion: 2
Hash: 9a2ca7bdbd1871f7131daf57de908e0c
@ -14,7 +14,6 @@ ClassTypes:
SerializeReferenceClassIdentifiers: []
Assets:
- Assets/Resources/Sfx/games/spaceSoccer/jp/highkicktoe1.ogg
- Assets/Resources/Sfx/games/spaceSoccer/jp/down.ogg
- Assets/Resources/Sfx/games/spaceSoccer/jp/highkicktoe3.ogg
- Assets/Resources/Sfx/games/spaceSoccer/jp/highkicktoe2.ogg
- Assets/Resources/Sfx/games/spaceSoccer/jp/kick.ogg

File diff suppressed because one or more lines are too long

View file

@ -3,5 +3,5 @@ guid: 43bbc451d19fb534396f896077f3c1ab
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleName: ntrlifting/common
assetBundleVariant:

View file

@ -1,22 +0,0 @@
fileFormatVersion: 2
guid: a05533c6dea3a0c4eb4cadca20267276
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: agbmarcher/locale
assetBundleVariant: en

View file

@ -1,22 +0,0 @@
fileFormatVersion: 2
guid: 04f01e04ec8a5b745a6dbe24a6c5b5f2
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:

View file

@ -1,22 +0,0 @@
fileFormatVersion: 2
guid: 88c19e8a28b3a4648aa376ad50781f76
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:

View file

@ -18,5 +18,5 @@ AudioImporter:
ambisonic: 0
3D: 1
userData:
assetBundleName:
assetBundleName: ntrlifting/common
assetBundleVariant:

View file

@ -18,5 +18,5 @@ AudioImporter:
ambisonic: 0
3D: 1
userData:
assetBundleName:
assetBundleName: ntrlifting/common
assetBundleVariant:

View file

@ -18,5 +18,5 @@ AudioImporter:
ambisonic: 0
3D: 1
userData:
assetBundleName:
assetBundleName: ntrlifting/common
assetBundleVariant:

View file

@ -18,5 +18,5 @@ AudioImporter:
ambisonic: 0
3D: 1
userData:
assetBundleName:
assetBundleName: ntrlifting/common
assetBundleVariant:

View file

@ -18,5 +18,5 @@ AudioImporter:
ambisonic: 0
3D: 1
userData:
assetBundleName:
assetBundleName: ntrlifting/common
assetBundleVariant:

View file

@ -18,5 +18,5 @@ AudioImporter:
ambisonic: 0
3D: 1
userData:
assetBundleName:
assetBundleName: ntrlifting/common
assetBundleVariant:

View file

@ -18,5 +18,5 @@ AudioImporter:
ambisonic: 0
3D: 1
userData:
assetBundleName:
assetBundleName: ntrlifting/common
assetBundleVariant:

View file

@ -18,5 +18,5 @@ AudioImporter:
ambisonic: 0
3D: 1
userData:
assetBundleName:
assetBundleName: ntrlifting/common
assetBundleVariant:

View file

@ -18,5 +18,5 @@ AudioImporter:
ambisonic: 0
3D: 1
userData:
assetBundleName:
assetBundleName: ntrlifting/common
assetBundleVariant:

View file

@ -18,5 +18,5 @@ AudioImporter:
ambisonic: 0
3D: 1
userData:
assetBundleName:
assetBundleName: ntrlifting/common
assetBundleVariant:

View file

@ -18,5 +18,5 @@ AudioImporter:
ambisonic: 0
3D: 1
userData:
assetBundleName:
assetBundleName: ntrlifting/common
assetBundleVariant:

View file

@ -18,5 +18,5 @@ AudioImporter:
ambisonic: 0
3D: 1
userData:
assetBundleName:
assetBundleName: ntrlifting/common
assetBundleVariant:

View file

@ -18,5 +18,5 @@ AudioImporter:
ambisonic: 0
3D: 1
userData:
assetBundleName:
assetBundleName: ntrlifting/common
assetBundleVariant:

View file

@ -4,5 +4,5 @@ folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
assetBundleName: ntrlifting/locale
assetBundleVariant: en

View file

@ -18,5 +18,5 @@ AudioImporter:
ambisonic: 0
3D: 1
userData:
assetBundleName:
assetBundleVariant:
assetBundleName: ntrlifting/locale
assetBundleVariant: en

View file

@ -18,5 +18,5 @@ AudioImporter:
ambisonic: 0
3D: 1
userData:
assetBundleName:
assetBundleVariant:
assetBundleName: ntrlifting/locale
assetBundleVariant: en

View file

@ -18,5 +18,5 @@ AudioImporter:
ambisonic: 0
3D: 1
userData:
assetBundleName:
assetBundleVariant:
assetBundleName: ntrlifting/locale
assetBundleVariant: en

View file

@ -18,5 +18,5 @@ AudioImporter:
ambisonic: 0
3D: 1
userData:
assetBundleName:
assetBundleVariant:
assetBundleName: ntrlifting/locale
assetBundleVariant: en

View file

@ -18,5 +18,5 @@ AudioImporter:
ambisonic: 0
3D: 1
userData:
assetBundleName:
assetBundleName: ntrlifting/common
assetBundleVariant:

View file

@ -18,5 +18,5 @@ AudioImporter:
ambisonic: 0
3D: 1
userData:
assetBundleName:
assetBundleName: ntrlifting/common
assetBundleVariant:

View file

@ -18,5 +18,5 @@ AudioImporter:
ambisonic: 0
3D: 1
userData:
assetBundleName:
assetBundleName: ntrlifting/common
assetBundleVariant:

View file

@ -18,5 +18,5 @@ AudioImporter:
ambisonic: 0
3D: 1
userData:
assetBundleName:
assetBundleName: ntrlifting/common
assetBundleVariant:

View file

@ -18,5 +18,5 @@ AudioImporter:
ambisonic: 0
3D: 1
userData:
assetBundleName:
assetBundleName: ntrlifting/common
assetBundleVariant:

View file

@ -18,5 +18,5 @@ AudioImporter:
ambisonic: 0
3D: 1
userData:
assetBundleName:
assetBundleName: ntrlifting/common
assetBundleVariant:

View file

@ -4,5 +4,5 @@ folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
assetBundleName: ntrlifting/locale
assetBundleVariant: jp

View file

@ -1,22 +0,0 @@
fileFormatVersion: 2
guid: d33d075113a14b749bcaac3f542e1ef5
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:

View file

@ -18,5 +18,5 @@ AudioImporter:
ambisonic: 0
3D: 1
userData:
assetBundleName:
assetBundleVariant:
assetBundleName: ntrlifting/locale
assetBundleVariant: jp

View file

@ -18,5 +18,5 @@ AudioImporter:
ambisonic: 0
3D: 1
userData:
assetBundleName:
assetBundleVariant:
assetBundleName: ntrlifting/locale
assetBundleVariant: jp

View file

@ -18,5 +18,5 @@ AudioImporter:
ambisonic: 0
3D: 1
userData:
assetBundleName:
assetBundleVariant:
assetBundleName: ntrlifting/locale
assetBundleVariant: jp

View file

@ -18,5 +18,5 @@ AudioImporter:
ambisonic: 0
3D: 1
userData:
assetBundleName:
assetBundleVariant:
assetBundleName: ntrlifting/locale
assetBundleVariant: jp

View file

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 9e8fafbde4181154d8479ff9883b3bff
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName: ntrlifting/locale
assetBundleVariant: ko

View file

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 142ef3358419e564f85a159dff8a3fd0
guid: ab7bfd5bacb10a24c8adda6f1563b891
AudioImporter:
externalObjects: {}
serializedVersion: 6
@ -18,5 +18,5 @@ AudioImporter:
ambisonic: 0
3D: 1
userData:
assetBundleName:
assetBundleVariant:
assetBundleName: ntrlifting/locale
assetBundleVariant: ko

View file

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: e5c0427e4ca63b24faa34a2316ddfc69
guid: 7b7b8297816783d42b8409e668596b12
AudioImporter:
externalObjects: {}
serializedVersion: 6
@ -18,5 +18,5 @@ AudioImporter:
ambisonic: 0
3D: 1
userData:
assetBundleName:
assetBundleVariant:
assetBundleName: ntrlifting/locale
assetBundleVariant: ko

View file

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: dd77724db4bd9b64c80aa3a9a9e93f36
guid: 029b2d925f5d568478821e11a1313bfd
AudioImporter:
externalObjects: {}
serializedVersion: 6
@ -18,5 +18,5 @@ AudioImporter:
ambisonic: 0
3D: 1
userData:
assetBundleName:
assetBundleVariant:
assetBundleName: ntrlifting/locale
assetBundleVariant: ko

View file

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: d3dceb5c1f5c3764bae1b97364327d56
guid: 0be5d8bc398f1f64787fe7481f6871ab
AudioImporter:
externalObjects: {}
serializedVersion: 6
@ -18,5 +18,5 @@ AudioImporter:
ambisonic: 0
3D: 1
userData:
assetBundleName:
assetBundleVariant:
assetBundleName: ntrlifting/locale
assetBundleVariant: ko

View file

@ -18,5 +18,5 @@ AudioImporter:
ambisonic: 0
3D: 1
userData:
assetBundleName:
assetBundleName: ntrlifting/common
assetBundleVariant:

View file

@ -104,6 +104,32 @@ AnimatorState:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
--- !u!1102 &-4897804028210897886
AnimatorState:
serializedVersion: 6
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Word07ko
m_Speed: 1
m_CycleOffset: 0
m_Transitions: []
m_StateMachineBehaviours: []
m_Position: {x: 50, y: 50, z: 0}
m_IKOnFeet: 0
m_WriteDefaultValues: 1
m_Mirror: 0
m_SpeedParameterActive: 0
m_MirrorParameterActive: 0
m_CycleOffsetParameterActive: 0
m_TimeParameterActive: 0
m_Motion: {fileID: 7400000, guid: 39a18cd4032b93c48b1df21c3bf9ffdf, type: 2}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
--- !u!1102 &-3526870332612620235
AnimatorState:
serializedVersion: 6
@ -386,6 +412,84 @@ AnimatorState:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
--- !u!1102 &1688661008542384708
AnimatorState:
serializedVersion: 6
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Word01ko
m_Speed: 1
m_CycleOffset: 0
m_Transitions: []
m_StateMachineBehaviours: []
m_Position: {x: 50, y: 50, z: 0}
m_IKOnFeet: 0
m_WriteDefaultValues: 1
m_Mirror: 0
m_SpeedParameterActive: 0
m_MirrorParameterActive: 0
m_CycleOffsetParameterActive: 0
m_TimeParameterActive: 0
m_Motion: {fileID: 7400000, guid: 43c01c597ac43ef49992ed6da38ed501, type: 2}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
--- !u!1102 &1771497336664646425
AnimatorState:
serializedVersion: 6
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Word02ko
m_Speed: 1
m_CycleOffset: 0
m_Transitions: []
m_StateMachineBehaviours: []
m_Position: {x: 50, y: 50, z: 0}
m_IKOnFeet: 0
m_WriteDefaultValues: 1
m_Mirror: 0
m_SpeedParameterActive: 0
m_MirrorParameterActive: 0
m_CycleOffsetParameterActive: 0
m_TimeParameterActive: 0
m_Motion: {fileID: 7400000, guid: 9fe40c08cc811f94ca0b67a6adff945b, type: 2}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
--- !u!1102 &2181168820292078193
AnimatorState:
serializedVersion: 6
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Word06ko
m_Speed: 1
m_CycleOffset: 0
m_Transitions: []
m_StateMachineBehaviours: []
m_Position: {x: 50, y: 50, z: 0}
m_IKOnFeet: 0
m_WriteDefaultValues: 1
m_Mirror: 0
m_SpeedParameterActive: 0
m_MirrorParameterActive: 0
m_CycleOffsetParameterActive: 0
m_TimeParameterActive: 0
m_Motion: {fileID: 7400000, guid: e4595abeb86d97c4ab2448a059684251, type: 2}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
--- !u!1107 &2343242441272630556
AnimatorStateMachine:
serializedVersion: 6
@ -446,6 +550,30 @@ AnimatorStateMachine:
- serializedVersion: 1
m_State: {fileID: -2824307223673216244}
m_Position: {x: -70, y: 250, z: 0}
- serializedVersion: 1
m_State: {fileID: 2572183018037726476}
m_Position: {x: -420, y: -190, z: 0}
- serializedVersion: 1
m_State: {fileID: 1688661008542384708}
m_Position: {x: -350, y: -130, z: 0}
- serializedVersion: 1
m_State: {fileID: 1771497336664646425}
m_Position: {x: -190, y: -190, z: 0}
- serializedVersion: 1
m_State: {fileID: 5096479150598746167}
m_Position: {x: -120, y: -130, z: 0}
- serializedVersion: 1
m_State: {fileID: 2440121354633526500}
m_Position: {x: 40, y: -190, z: 0}
- serializedVersion: 1
m_State: {fileID: 2521983481810213845}
m_Position: {x: 110, y: -130, z: 0}
- serializedVersion: 1
m_State: {fileID: 2181168820292078193}
m_Position: {x: 270, y: -190, z: 0}
- serializedVersion: 1
m_State: {fileID: -4897804028210897886}
m_Position: {x: 340, y: -130, z: 0}
m_ChildStateMachines: []
m_AnyStateTransitions: []
m_EntryTransitions: []
@ -456,6 +584,84 @@ AnimatorStateMachine:
m_ExitPosition: {x: 800, y: 120, z: 0}
m_ParentStateMachinePosition: {x: 800, y: 20, z: 0}
m_DefaultState: {fileID: 1133350279288983051}
--- !u!1102 &2440121354633526500
AnimatorState:
serializedVersion: 6
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Word04ko
m_Speed: 1
m_CycleOffset: 0
m_Transitions: []
m_StateMachineBehaviours: []
m_Position: {x: 50, y: 50, z: 0}
m_IKOnFeet: 0
m_WriteDefaultValues: 1
m_Mirror: 0
m_SpeedParameterActive: 0
m_MirrorParameterActive: 0
m_CycleOffsetParameterActive: 0
m_TimeParameterActive: 0
m_Motion: {fileID: 7400000, guid: 50c6d5706d261624895cfe6da6686c33, type: 2}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
--- !u!1102 &2521983481810213845
AnimatorState:
serializedVersion: 6
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Word05ko
m_Speed: 1
m_CycleOffset: 0
m_Transitions: []
m_StateMachineBehaviours: []
m_Position: {x: 50, y: 50, z: 0}
m_IKOnFeet: 0
m_WriteDefaultValues: 1
m_Mirror: 0
m_SpeedParameterActive: 0
m_MirrorParameterActive: 0
m_CycleOffsetParameterActive: 0
m_TimeParameterActive: 0
m_Motion: {fileID: 7400000, guid: 339eef723874d4649bdaaa9e4d54a3b0, type: 2}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
--- !u!1102 &2572183018037726476
AnimatorState:
serializedVersion: 6
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Word00ko
m_Speed: 1
m_CycleOffset: 0
m_Transitions: []
m_StateMachineBehaviours: []
m_Position: {x: 50, y: 50, z: 0}
m_IKOnFeet: 0
m_WriteDefaultValues: 1
m_Mirror: 0
m_SpeedParameterActive: 0
m_MirrorParameterActive: 0
m_CycleOffsetParameterActive: 0
m_TimeParameterActive: 0
m_Motion: {fileID: 7400000, guid: 787ee10e494f6ca48adcee3d28269331, type: 2}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
--- !u!1102 &3055973964947669555
AnimatorState:
serializedVersion: 6
@ -482,6 +688,32 @@ AnimatorState:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
--- !u!1102 &5096479150598746167
AnimatorState:
serializedVersion: 6
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Word03ko
m_Speed: 1
m_CycleOffset: 0
m_Transitions: []
m_StateMachineBehaviours: []
m_Position: {x: 50, y: 50, z: 0}
m_IKOnFeet: 0
m_WriteDefaultValues: 1
m_Mirror: 0
m_SpeedParameterActive: 0
m_MirrorParameterActive: 0
m_CycleOffsetParameterActive: 0
m_TimeParameterActive: 0
m_Motion: {fileID: 7400000, guid: ceb852f9b2521b143ab7a46e5be77b10, type: 2}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
--- !u!1102 &8137621832453990429
AnimatorState:
serializedVersion: 6

View file

@ -84,7 +84,7 @@ AnimationClip:
m_Curve:
- serializedVersion: 3
time: 0
value: {x: -4.5, y: 1, z: 0}
value: {x: -2.4, y: 1.9, z: 0}
inSlope: {x: 0, y: 0, z: 0}
outSlope: {x: 0, y: 0, z: 0}
tangentMode: 0
@ -352,7 +352,7 @@ AnimationClip:
m_Curve:
- serializedVersion: 3
time: 0
value: -4.5
value: -2.4
inSlope: 0
outSlope: 0
tangentMode: 136
@ -371,7 +371,7 @@ AnimationClip:
m_Curve:
- serializedVersion: 3
time: 0
value: 1
value: 1.9
inSlope: 0
outSlope: 0
tangentMode: 136

View file

@ -84,7 +84,7 @@ AnimationClip:
m_Curve:
- serializedVersion: 3
time: 0
value: {x: -3.72, y: 1.7, z: 0}
value: {x: -3.12, y: 2.1, z: 0}
inSlope: {x: 0, y: 0, z: 0}
outSlope: {x: 0, y: 0, z: 0}
tangentMode: 0
@ -349,7 +349,7 @@ AnimationClip:
m_Curve:
- serializedVersion: 3
time: 0
value: -3.72
value: -3.12
inSlope: 0
outSlope: 0
tangentMode: 136
@ -368,7 +368,7 @@ AnimationClip:
m_Curve:
- serializedVersion: 3
time: 0
value: 1.7
value: 2.1
inSlope: 0
outSlope: 0
tangentMode: 136

View file

@ -100,7 +100,7 @@ AnimationClip:
m_Curve:
- serializedVersion: 3
time: 0
value: {x: -1.203, y: 1, z: 0}
value: {x: -0.75, y: 1.5, z: 0}
inSlope: {x: 0, y: 0, z: 0}
outSlope: {x: 0, y: 0, z: 0}
tangentMode: 0
@ -463,7 +463,7 @@ AnimationClip:
m_Curve:
- serializedVersion: 3
time: 0
value: -1.203
value: -0.75
inSlope: 0
outSlope: 0
tangentMode: 136
@ -482,7 +482,7 @@ AnimationClip:
m_Curve:
- serializedVersion: 3
time: 0
value: 1
value: 1.5
inSlope: 0
outSlope: 0
tangentMode: 136

View file

@ -68,7 +68,7 @@ AnimationClip:
m_Curve:
- serializedVersion: 3
time: 0
value: {x: -1.203, y: 1, z: 0}
value: {x: -0.75, y: 1.5, z: 0}
inSlope: {x: 0, y: 0, z: 0}
outSlope: {x: 0, y: 0, z: 0}
tangentMode: 0
@ -235,7 +235,7 @@ AnimationClip:
m_Curve:
- serializedVersion: 3
time: 0
value: -1.203
value: -0.75
inSlope: 0
outSlope: 0
tangentMode: 136
@ -254,7 +254,7 @@ AnimationClip:
m_Curve:
- serializedVersion: 3
time: 0
value: 1
value: 1.5
inSlope: 0
outSlope: 0
tangentMode: 136

View file

@ -100,7 +100,7 @@ AnimationClip:
m_Curve:
- serializedVersion: 3
time: 0
value: {x: -1.203, y: 1, z: 0}
value: {x: -0.75, y: 1.5, z: 0}
inSlope: {x: 0, y: 0, z: 0}
outSlope: {x: 0, y: 0, z: 0}
tangentMode: 0
@ -463,7 +463,7 @@ AnimationClip:
m_Curve:
- serializedVersion: 3
time: 0
value: -1.203
value: -0.75
inSlope: 0
outSlope: 0
tangentMode: 136
@ -482,7 +482,7 @@ AnimationClip:
m_Curve:
- serializedVersion: 3
time: 0
value: 1
value: 1.5
inSlope: 0
outSlope: 0
tangentMode: 136

View file

@ -100,7 +100,7 @@ AnimationClip:
m_Curve:
- serializedVersion: 3
time: 0
value: {x: -1.203, y: 1, z: 0}
value: {x: -0.75, y: 1.5, z: 0}
inSlope: {x: 0, y: 0, z: 0}
outSlope: {x: 0, y: 0, z: 0}
tangentMode: 0
@ -463,7 +463,7 @@ AnimationClip:
m_Curve:
- serializedVersion: 3
time: 0
value: -1.203
value: -0.75
inSlope: 0
outSlope: 0
tangentMode: 136
@ -482,7 +482,7 @@ AnimationClip:
m_Curve:
- serializedVersion: 3
time: 0
value: 1
value: 1.5
inSlope: 0
outSlope: 0
tangentMode: 136

View file

@ -100,7 +100,7 @@ AnimationClip:
m_Curve:
- serializedVersion: 3
time: 0
value: {x: -1.203, y: 1, z: 0}
value: {x: -0.75, y: 1.5, z: 0}
inSlope: {x: 0, y: 0, z: 0}
outSlope: {x: 0, y: 0, z: 0}
tangentMode: 0
@ -463,7 +463,7 @@ AnimationClip:
m_Curve:
- serializedVersion: 3
time: 0
value: -1.203
value: -0.75
inSlope: 0
outSlope: 0
tangentMode: 136
@ -482,7 +482,7 @@ AnimationClip:
m_Curve:
- serializedVersion: 3
time: 0
value: 1
value: 1.5
inSlope: 0
outSlope: 0
tangentMode: 136

View file

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: e0df2d92e990a2d40954fc2955f168a4
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View file

@ -52,7 +52,7 @@ TextureImporter:
second: karateman_word_combo_ko
- first:
213: -8815329408293105640
second: karateman_word_grr_ko
second: karateman_word_mu_ko
- first:
213: -1319785177184087858
second: karateman_word_hit_ko
@ -385,7 +385,7 @@ TextureImporter:
width: 719
height: 461
alignment: 0
pivot: {x: 0, y: 0}
pivot: {x: 0.5, y: 0.5}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
@ -398,7 +398,7 @@ TextureImporter:
edges: []
weights: []
- serializedVersion: 2
name: karateman_word_grr_ko
name: karateman_word_mu_ko
rect:
serializedVersion: 2
x: 1508
@ -406,7 +406,7 @@ TextureImporter:
width: 428
height: 477
alignment: 0
pivot: {x: 0, y: 0}
pivot: {x: 0.5, y: 0.5}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
@ -427,7 +427,7 @@ TextureImporter:
width: 396
height: 339
alignment: 0
pivot: {x: 0, y: 0}
pivot: {x: 0.5, y: 0.5}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []

View file

@ -2,8 +2,8 @@ using System;
public static class AppInfo {
//--- AutoGenerated.begin
public const string Version = "0.0.1041";
public static readonly DateTime Date = new DateTime(2022, 12, 10, 01, 15, 57, 474, DateTimeKind.Utc);
public const string Version = "0.0.1042";
public static readonly DateTime Date = new DateTime(2022, 12, 11, 00, 12, 14, 529, DateTimeKind.Utc);
//--- AutoGenerated.end
}

View file

@ -71,6 +71,7 @@ namespace HeavenStudio.Games
private float currentClappingLength;
private float lastClapStart;
private int clapIndex;
public int missBopCount;
private ClappyTrioPlayer ClappyTrioPlayer;
@ -118,7 +119,6 @@ namespace HeavenStudio.Games
private void Update()
{
float resetTime = 0f;
if (isClapping)
{
float songPosBeat = Conductor.instance.songPositionInBeats;
@ -157,16 +157,11 @@ namespace HeavenStudio.Games
clapIndex++;
}
resetTime = lastClapStart + length;
break;
}
}
}
if (Conductor.instance.songPositionInBeats > resetTime + 2)
{
reactHappy = false;
}
}
public void Clap(float beat, float length)
@ -211,11 +206,13 @@ namespace HeavenStudio.Games
{
for (int i = 0; i < Lion.Count; i++)
{
if (i == Lion.Count - 1)
if (i == Lion.Count - 1 || missBopCount < 2)
{
SetFace(i, 0);
missBopCount += 1;
} else
{
SetFace(i, 2);
}
}

View file

@ -80,6 +80,7 @@ namespace HeavenStudio.Games.Scripts_ClappyTrio
clapEffect.SetActive(false);
Jukebox.PlayOneShot("miss");
ClappyTrio.instance.playerHitLast = false;
ClappyTrio.instance.missBopCount = 0;
if (clapStarted)
this.canHit = false;

View file

@ -75,7 +75,7 @@ namespace HeavenStudio.Games.Loaders
},
new GameAction("honki", "Serious Chance")
{
function = delegate { var e = eventCaller.currentEntity; KarateMan.instance.Honki(e.beat, e.length, e["type"], e["toggle"], e["toggle2"], e["toggle3"], e["toggle4"]); },
function = delegate { var e = eventCaller.currentEntity; KarateMan.instance.Honki(e.beat, e.length, e["type"], e["toggle"], e["toggle2"], e["type2"]); },
defaultLength = 1f,
resizable = true,
parameters = new List<Param>()
@ -83,8 +83,7 @@ namespace HeavenStudio.Games.Loaders
new Param("type", KarateMan.HonkiChanceType.OneObject, "Serious Chance Type", "Whether all objects, one object or no object is required for Serious Mode"),
new Param("toggle", false, "Deactivate Serious", "This deactivates Serious Mode"),
new Param("toggle2", false, "Miss can Lose", "This makes it so if you miss too many times, Serious Mode deactivates"),
new Param("toggle3", false, "Disable Sound", "Disables the 'GONG' sound when it activates"),
new Param("toggle4", false, "Alt Sound", "Play the alternate sound, used in transitions of Remix 8")
new Param("type2", KarateMan.HonkiSoundType.SeriousModeHit, "Sound", "Sound that plays on Switch"),
}
},
new GameAction("hitX", "Warnings")
@ -331,7 +330,7 @@ namespace HeavenStudio.Games
{
English,
Japanese,
//Korean
Korean
}
public enum HitThreeLength
@ -358,6 +357,13 @@ namespace HeavenStudio.Games
IgnoreObject
}
public enum HonkiSoundType
{
SeriousModeHit,
SeriousModeTransition,
None
}
public enum LightBulbType
{
Normal,
@ -739,36 +745,36 @@ namespace HeavenStudio.Games
cameraReturnLength = Mathf.Min(2f, length*0.5f);
}
public void Honki(float beat, float length, int type, bool deactivate, bool miss, bool noSound, bool alt)
public void Honki(float beat, float length, int type, bool deactivate, bool miss, int sound)
{
GameObject mobj = GameObject.Instantiate(Item, ItemHolder);
KarateManPot mobjDat = mobj.GetComponent<KarateManPot>();
HonkiChanceStart = beat;
HonkiChanceLength = length;
/*if (beat >= HonkiChanceStart && beat <= HonkiChanceStart + HonkiChanceLength)
{
if (PlayerInput.Pressed() && IsExpectingInputNow())
ActivateHonki(beat, deactivate, noSound, alt);
}*/
mobjDat.deactivateHonki = deactivate;
mobjDat.honkiSound = sound;
if (type == (int) HonkiChanceType.IgnoreObject)
ActivateHonki(beat, deactivate, noSound, alt);
ActivateHonki(beat, deactivate, sound);
}
public void ActivateHonki(float beat, bool deactivate, bool noSound, bool alt)
public void ActivateHonki(float beat, bool deactivate, int sound)
{
if (!noSound)
switch (sound)
{
if (alt)
Jukebox.PlayOneShotGame("karateman/gogoSwitch");
else
case (int)HonkiSoundType.SeriousModeHit:
Jukebox.PlayOneShotGame("karateman/gogo");
break;
case (int)HonkiSoundType.SeriousModeTransition:
Jukebox.PlayOneShotGame("karateman/gogoSwitch");
break;
default:
break;
}
if (!deactivate)
HonkiMode = true;
else
HonkiMode = false;
if (HonkiMode)
if (!deactivate)
{
HonkiMode = true;
BGHonki.SetActive(true);
BGGradient.SetActive(false);
BGBlood.SetActive(false);
@ -779,8 +785,11 @@ namespace HeavenStudio.Games
HighlightColor = Color.white;
}
else
{
HonkiMode = false;
BGHonki.SetActive(false);
}
}
public void DoWord(float beat, int type, int voiceType, int language, bool pitch, int graphLength, int voiceDelay, bool fast)
{
@ -938,8 +947,16 @@ namespace HeavenStudio.Games
{
wordClearTime = clear;
}
switch (language)
{
case (int) HitThreeGraphicLang.Japanese:
return word + "jp";
case (int) HitThreeGraphicLang.Korean:
return word + "ko";
default:
return word;
}
}
float HitExpressionLength(int type)
{

View file

@ -143,7 +143,7 @@ namespace HeavenStudio.Games.Scripts_KarateMan
{
if (!KarateMan.instance.IsExpectingInputNow())
{
if ((KarateMan.instance.IsNoriActive && KarateMan.instance.NoriPerformance >= 0.6f || KarateMan.HonkiMode) && KarateMan.HighFlowPunch)
if ((KarateMan.instance.IsNoriActive && KarateMan.instance.NoriPerformance >= 0.6f) && KarateMan.HighFlowPunch)
Punch(2);
else
Punch(1);

View file

@ -34,8 +34,10 @@ namespace HeavenStudio.Games.Scripts_KarateMan
[SerializeField] Color[] ItemBarrelMap;
[SerializeField] Color[] ItemCookingLidMap;
public bool deactivateHonki = false;
public bool KickBarrelContent = false;
public int OnHitExpression = (int) KarateMan.KarateManFaces.Normal;
public int honkiSound = (int) KarateMan.HonkiSoundType.SeriousModeHit;
public float HitExpressionLength = 2f;
static float ItemHitNori = 0f;
@ -669,6 +671,8 @@ namespace HeavenStudio.Games.Scripts_KarateMan
int ItemPunchHand()
{
if (KarateMan.HonkiMode && KarateMan.HighFlowPunch)
return 4;
switch (type)
{
case ItemType.Rock:
@ -679,14 +683,14 @@ namespace HeavenStudio.Games.Scripts_KarateMan
case ItemType.KickBarrel:
return 2;
case ItemType.Ball:
if ((KarateMan.instance.IsNoriActive && KarateMan.instance.NoriPerformance >= 0.6f || KarateMan.HonkiMode) && KarateMan.HighFlowPunch)
if ((KarateMan.instance.IsNoriActive && KarateMan.instance.NoriPerformance >= 0.6f) && KarateMan.HighFlowPunch)
return 4;
else if (KarateMan.instance.IsNoriActive && KarateMan.HighFlowPunch)
return 0;
else
return 2;
default:
if ((KarateMan.instance.IsNoriActive && KarateMan.instance.NoriPerformance >= 0.6f || KarateMan.HonkiMode) && KarateMan.HighFlowPunch)
if ((KarateMan.instance.IsNoriActive && KarateMan.instance.NoriPerformance >= 0.6f) && KarateMan.HighFlowPunch)
return 4;
else
return 0;
@ -836,7 +840,7 @@ namespace HeavenStudio.Games.Scripts_KarateMan
Jukebox.PlayOneShotGame("karateman/hitNoNori", forcePlay: true);
if (startBeat >= KarateMan.instance.HonkiChanceStart && startBeat <= KarateMan.instance.HonkiChanceStart + KarateMan.instance.HonkiChanceLength)
{
KarateMan.instance.ActivateHonki(startBeat, false, false, false);
KarateMan.instance.ActivateHonki(startBeat, deactivateHonki, honkiSound);
joe.Punch(2);
}
else
@ -851,7 +855,7 @@ namespace HeavenStudio.Games.Scripts_KarateMan
var beat = Conductor.instance.songPositionInBeats;
if (beat >= kar.HonkiChanceStart && beat <= kar.HonkiChanceStart + kar.HonkiChanceLength)
{
KarateMan.instance.ActivateHonki(startBeat, false, false, false);
KarateMan.instance.ActivateHonki(startBeat, deactivateHonki, honkiSound);
straight = joe.Punch(2);
}
transform.rotation = Quaternion.Euler(0, 0, transform.rotation.eulerAngles.z - 30f);

View file

@ -48,11 +48,11 @@ namespace HeavenStudio.Games.Loaders
resizable = true,
hidden = true
},
});
/*new List<string>() {"ntr", "normal"},
},
new List<string>() {"ntr", "normal"},
"ntrlifting", "jp",
new List<string>() {"en", "jp"}
);*/
new List<string>() {"en", "jp", "ko"}
);
}
}
}

Binary file not shown.

View file

@ -0,0 +1,61 @@
ManifestFileVersion: 0
CRC: 237503574
AssetBundleManifest:
AssetBundleInfos:
Info_0:
Name: ntridol/common
Dependencies: {}
Info_1:
Name: karate/common
Dependencies: {}
Info_2:
Name: ntrsamurai/common
Dependencies: {}
Info_3:
Name: ntrdj/common
Dependencies: {}
Info_4:
Name: ctrpillow/common
Dependencies: {}
Info_5:
Name: ntrcoin/common
Dependencies: {}
Info_6:
Name: ctrpillow/locale.ko
Dependencies: {}
Info_7:
Name: karate/locale.en
Dependencies: {}
Info_8:
Name: ctrpillow/locale.jp
Dependencies: {}
Info_9:
Name: ntridol/locale.jp
Dependencies: {}
Info_10:
Name: ctrpillow/locale.en
Dependencies: {}
Info_11:
Name: karate/locale.jp
Dependencies: {}
Info_12:
Name: karate/locale.ko
Dependencies: {}
Info_13:
Name: agbmarcher/common
Dependencies: {}
Info_14:
Name: agbmarcher/locale.en
Dependencies: {}
Info_15:
Name: rvlbadminton/common
Dependencies: {}
Info_16:
Name: ntrlifting/locale.jp
Dependencies: {}
Info_17:
Name: ntrlifting/common
Dependencies: {}
Info_18:
Name: ntrlifting/locale.en
Dependencies: {}

View file

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 537b285866eba514eb8faf49bf3e0049
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View file

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: f6d56570301656748857d3f38c706446
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View file

@ -1,5 +1,5 @@
ManifestFileVersion: 0
CRC: 3253795352
CRC: 2559333275
AssetBundleManifest:
AssetBundleInfos:
Info_0:
@ -50,3 +50,15 @@ AssetBundleManifest:
Info_15:
Name: rvlbadminton/common
Dependencies: {}
Info_16:
Name: ntrlifting/locale.jp
Dependencies: {}
Info_17:
Name: ntrlifting/common
Dependencies: {}
Info_18:
Name: ntrlifting/locale.en
Dependencies: {}
Info_19:
Name: ntrlifting/locale.ko
Dependencies: {}

Binary file not shown.

View file

@ -1,9 +1,9 @@
ManifestFileVersion: 0
CRC: 1541368266
CRC: 1027358570
Hashes:
AssetFileHash:
serializedVersion: 2
Hash: db87ed35cf9461c38e1fdf65d4af1cd2
Hash: a6b455624954b3ebcf640989b52d616f
TypeTreeHash:
serializedVersion: 2
Hash: 9a2ca7bdbd1871f7131daf57de908e0c

Some files were not shown because too many files have changed in this diff Show more