diff --git a/Assets/Resources/Sfx/games/marchingOrders/en/leftFaceTurn2fast.ogg.meta b/Assets/Resources/Sfx/games/marchingOrders/en/leftFaceTurn2fast.ogg.meta
index 038e9c39..93076a02 100644
--- a/Assets/Resources/Sfx/games/marchingOrders/en/leftFaceTurn2fast.ogg.meta
+++ b/Assets/Resources/Sfx/games/marchingOrders/en/leftFaceTurn2fast.ogg.meta
@@ -1,5 +1,5 @@
fileFormatVersion: 2
-guid: b9ba95f502bd4a847be9b5cda457fa74
+guid: f98f1a470d7ca0d40ab436dd82069210
AudioImporter:
externalObjects: {}
serializedVersion: 6
@@ -18,5 +18,5 @@ AudioImporter:
ambisonic: 0
3D: 1
userData:
- assetBundleName: agbmarcher/locale
- assetBundleVariant: en
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Resources/Sfx/games/marchingOrders/en/rightFaceTurn2fast.ogg.meta b/Assets/Resources/Sfx/games/marchingOrders/en/rightFaceTurn2fast.ogg.meta
index d3982bdb..9ccbce7a 100644
--- a/Assets/Resources/Sfx/games/marchingOrders/en/rightFaceTurn2fast.ogg.meta
+++ b/Assets/Resources/Sfx/games/marchingOrders/en/rightFaceTurn2fast.ogg.meta
@@ -1,5 +1,5 @@
fileFormatVersion: 2
-guid: d44b0dce2217c624c9f25c0f9b43e1fe
+guid: d8a834a646793834eb3c8a4f1ed38e5f
AudioImporter:
externalObjects: {}
serializedVersion: 6
@@ -18,5 +18,5 @@ AudioImporter:
ambisonic: 0
3D: 1
userData:
- assetBundleName: agbmarcher/locale
- assetBundleVariant: en
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Scripts/Games/CatchyTune/CatchyTune.cs b/Assets/Scripts/Games/CatchyTune/CatchyTune.cs
index eadb000b..aaca593f 100644
--- a/Assets/Scripts/Games/CatchyTune/CatchyTune.cs
+++ b/Assets/Scripts/Games/CatchyTune/CatchyTune.cs
@@ -20,9 +20,10 @@ namespace HeavenStudio.Games.Loaders
parameters = new List()
{
new Param("side", CatchyTune.Side.Left, "Side", "The side the orange falls down"),
- new Param("smile", false, "Smile", "If the characters smile with the heart message after catching")
+ new Param("smile", false, "Smile", "If the characters smile with the heart message after catching"),
+ new Param("endSmile", new EntityTypes.Float(2, 100), "End Smile Beat", "How many beats after the catch should the smile end?")
},
- preFunction = delegate {var e = eventCaller.currentEntity; CatchyTune.PreDropFruit(e.beat, e["side"], e["smile"], false); },
+ preFunction = delegate {var e = eventCaller.currentEntity; CatchyTune.PreDropFruit(e.beat, e["side"], e["smile"], false, e["endSmile"]); },
},
new GameAction("pineapple", "Pineapple")
@@ -31,9 +32,10 @@ namespace HeavenStudio.Games.Loaders
parameters = new List()
{
new Param("side", CatchyTune.Side.Left, "Side", "The side the pineapple falls down"),
- new Param("smile", false, "Smile", "If the characters smile with the heart message after catching")
+ new Param("smile", false, "Smile", "If the characters smile with the heart message after catching"),
+ new Param("endSmile", new EntityTypes.Float(2, 100), "End Smile Beat", "How many beats after the catch should the smile end?")
},
- preFunction = delegate {var e = eventCaller.currentEntity; CatchyTune.PreDropFruit(e.beat, e["side"], e["smile"], true); },
+ preFunction = delegate {var e = eventCaller.currentEntity; CatchyTune.PreDropFruit(e.beat, e["side"], e["smile"], true, e["endSmile"]); },
},
new GameAction("bop", "Bop")
@@ -117,6 +119,7 @@ namespace HeavenStudio.Games
public int side;
public bool smile;
public bool isPineapple;
+ public float endSmile;
}
private void Awake()
@@ -137,7 +140,7 @@ namespace HeavenStudio.Games
{
foreach (var fruit in queuedFruits)
{
- DropFruit(fruit.beat, fruit.side, fruit.smile, fruit.isPineapple);
+ DropFruit(fruit.beat, fruit.side, fruit.smile, fruit.isPineapple, fruit.endSmile);
}
queuedFruits.Clear();
}
@@ -201,23 +204,23 @@ namespace HeavenStudio.Games
}
}
- public void DropFruit(float beat, int side, bool smile, bool isPineapple)
+ public void DropFruit(float beat, int side, bool smile, bool isPineapple, float endSmile)
{
var objectToSpawn = isPineapple ? pineappleBase : orangeBase;
if (side == (int)Side.Left || side == (int)Side.Both)
{
- DropFruitSingle(beat, false, smile, objectToSpawn);
+ DropFruitSingle(beat, false, smile, objectToSpawn, endSmile);
}
if (side == (int)Side.Right || side == (int)Side.Both)
{
- DropFruitSingle(beat, true, smile, objectToSpawn);
+ DropFruitSingle(beat, true, smile, objectToSpawn, endSmile);
}
}
//minenice: experiment to test preFunction
- public static void PreDropFruit(float beat, int side, bool smile, bool isPineapple)
+ public static void PreDropFruit(float beat, int side, bool smile, bool isPineapple, float endSmile)
{
float spawnBeat = beat - 1f;
beat = beat - (isPineapple ? 2f : 1f);
@@ -225,7 +228,7 @@ namespace HeavenStudio.Games
{
BeatAction.New(instance.gameObject, new List()
{
- new BeatAction.Action(spawnBeat, delegate { if (instance != null) instance.DropFruit(beat, side, smile, isPineapple); }),
+ new BeatAction.Action(spawnBeat, delegate { if (instance != null) instance.DropFruit(beat, side, smile, isPineapple, endSmile); }),
});
}
else
@@ -235,7 +238,8 @@ namespace HeavenStudio.Games
beat = beat,
side = side,
smile = smile,
- isPineapple = isPineapple
+ isPineapple = isPineapple,
+ endSmile = endSmile
});
}
@@ -249,7 +253,7 @@ namespace HeavenStudio.Games
}
}
- public void DropFruitSingle(float beat, bool side, bool smile, GameObject objectToSpawn)
+ public void DropFruitSingle(float beat, bool side, bool smile, GameObject objectToSpawn, float endSmile)
{
var newFruit = GameObject.Instantiate(objectToSpawn, fruitHolder);
@@ -257,6 +261,7 @@ namespace HeavenStudio.Games
fruitComp.startBeat = beat;
fruitComp.side = side;
fruitComp.smile = smile;
+ fruitComp.endSmile = endSmile;
newFruit.SetActive(true);
}
@@ -280,7 +285,7 @@ namespace HeavenStudio.Games
}
}
- public void catchSuccess(bool side, bool isPineapple, bool smile, float beat)
+ public void catchSuccess(bool side, bool isPineapple, bool smile, float beat, float endSmile)
{
string anim = isPineapple ? "catchPineapple" : "catchOrange";
@@ -298,7 +303,7 @@ namespace HeavenStudio.Games
if (smile)
{
startSmile = beat + 1f;
- stopSmile = beat + 2f;
+ stopSmile = beat + endSmile;
}
}
diff --git a/Assets/Scripts/Games/CatchyTune/Fruit.cs b/Assets/Scripts/Games/CatchyTune/Fruit.cs
index de78df4f..7247b53b 100644
--- a/Assets/Scripts/Games/CatchyTune/Fruit.cs
+++ b/Assets/Scripts/Games/CatchyTune/Fruit.cs
@@ -21,6 +21,8 @@ namespace HeavenStudio.Games.Scripts_CatchyTune
public bool smile;
+ public float endSmile;
+
private string soundText;
private Minigame.Eligible e = new Minigame.Eligible();
@@ -155,7 +157,7 @@ namespace HeavenStudio.Games.Scripts_CatchyTune
else
{
Jukebox.PlayOneShotGame(soundText + "Catch");
- game.catchSuccess(side, isPineapple, smile, startBeat + beatLength);
+ game.catchSuccess(side, isPineapple, smile, startBeat + beatLength, endSmile);
Destroy(this.gameObject);
}
}
diff --git a/Assets/Scripts/Games/MarchingOrders/MarchingOrders.cs b/Assets/Scripts/Games/MarchingOrders/MarchingOrders.cs
index aaa588b3..662d2464 100644
--- a/Assets/Scripts/Games/MarchingOrders/MarchingOrders.cs
+++ b/Assets/Scripts/Games/MarchingOrders/MarchingOrders.cs
@@ -148,8 +148,6 @@ namespace HeavenStudio.Games
private int background;
private float steamTime;
- private string fastTurn;
-
static float wantMarch = float.MaxValue;
static float wantMarchLength = 0f;
@@ -401,6 +399,7 @@ namespace HeavenStudio.Games
public void SargeFaceTurn(float beat, int type, int type2, bool toggle)
{
+ string fastTurn = "";
switch (type2)
{
case (int) MarchingOrders.FaceTurnLength.Fast:
@@ -420,7 +419,7 @@ namespace HeavenStudio.Games
ScheduleInput(beat, turnLength + 2f, InputType.DIRECTION_LEFT_DOWN, LeftSuccess, GenericMiss, LeftEmpty);
MultiSound.Play(new MultiSound.Sound[] {
new MultiSound.Sound("marchingOrders/leftFaceTurn1" + fastTurn, beat),
- new MultiSound.Sound("marchingOrders/leftFaceTurn2" + fastTurn, beat + 0.6f),
+ new MultiSound.Sound("marchingOrders/leftFaceTurn2" + fastTurn, beat + 0.5f),
new MultiSound.Sound("marchingOrders/leftFaceTurn3", beat + turnLength + 1f),
new MultiSound.Sound("marchingOrders/turnAction", beat + turnLength + 2f),
}, forcePlay: true);
@@ -439,7 +438,7 @@ namespace HeavenStudio.Games
ScheduleInput(beat, turnLength + 2f, InputType.DIRECTION_RIGHT_DOWN, RightSuccess, GenericMiss, RightEmpty);
MultiSound.Play(new MultiSound.Sound[] {
new MultiSound.Sound("marchingOrders/rightFaceTurn1" + fastTurn, beat),
- new MultiSound.Sound("marchingOrders/rightFaceTurn2" + fastTurn, beat + 0.6f),
+ new MultiSound.Sound("marchingOrders/rightFaceTurn2" + fastTurn, beat + 0.5f),
new MultiSound.Sound("marchingOrders/rightFaceTurn3", beat + turnLength + 1f),
new MultiSound.Sound("marchingOrders/turnAction", beat + turnLength + 2f),
}, forcePlay: true);
diff --git a/Assets/StreamingAssets/StreamingAssets b/Assets/StreamingAssets/StreamingAssets
index 5325ebd7..a2541b62 100644
Binary files a/Assets/StreamingAssets/StreamingAssets and b/Assets/StreamingAssets/StreamingAssets differ
diff --git a/Assets/StreamingAssets/StreamingAssets.manifest b/Assets/StreamingAssets/StreamingAssets.manifest
index f137bf5b..7c4b5eee 100644
--- a/Assets/StreamingAssets/StreamingAssets.manifest
+++ b/Assets/StreamingAssets/StreamingAssets.manifest
@@ -1,51 +1,51 @@
ManifestFileVersion: 0
-CRC: 353797687
+CRC: 3816508211
AssetBundleManifest:
AssetBundleInfos:
Info_0:
- Name: ntridol/common
- Dependencies: {}
- Info_1:
- Name: karate/locale.en
- Dependencies: {}
- Info_2:
- Name: ctrpillow/common
- Dependencies: {}
- Info_3:
- Name: ntridol/locale.jp
- Dependencies: {}
- Info_4:
- Name: ntrsamurai/common
- Dependencies: {}
- Info_5:
Name: karate/common
Dependencies: {}
- Info_6:
- Name: ntrdj/common
+ Info_1:
+ Name: ctrpillow/common
Dependencies: {}
- Info_7:
- Name: ctrpillow/locale.en
- Dependencies: {}
- Info_8:
+ Info_2:
Name: ntrcoin/common
Dependencies: {}
- Info_9:
- Name: ntrsamurai/locale.en
+ Info_3:
+ Name: ntrsamurai/common
Dependencies: {}
- Info_10:
+ Info_4:
+ Name: ntrdj/common
+ Dependencies: {}
+ Info_5:
+ Name: ntridol/common
+ Dependencies: {}
+ Info_6:
Name: ctrpillow/locale.ko
Dependencies: {}
- Info_11:
+ 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: ntrsamurai/locale.en
+ Dependencies: {}
Info_12:
Name: ctrcatchy/common
Dependencies: {}
Info_13:
- Name: agbmarcher/locale.en
+ Name: agbmarcher/locale.jp
Dependencies: {}
Info_14:
- Name: agbmarcher/locale.jp
+ Name: agbmarcher/locale.en
Dependencies: {}
Info_15:
Name: agbmarcher/common
diff --git a/Assets/StreamingAssets/agbmarcher/locale.en b/Assets/StreamingAssets/agbmarcher/locale.en
index b0278dc7..0a1b4472 100644
Binary files a/Assets/StreamingAssets/agbmarcher/locale.en and b/Assets/StreamingAssets/agbmarcher/locale.en differ
diff --git a/Assets/StreamingAssets/agbmarcher/locale.en.manifest b/Assets/StreamingAssets/agbmarcher/locale.en.manifest
index 3a0db47f..ac8cf3c3 100644
--- a/Assets/StreamingAssets/agbmarcher/locale.en.manifest
+++ b/Assets/StreamingAssets/agbmarcher/locale.en.manifest
@@ -1,9 +1,9 @@
ManifestFileVersion: 0
-CRC: 4043620927
+CRC: 848519032
Hashes:
AssetFileHash:
serializedVersion: 2
- Hash: fbfb77a711629ab8a4092d86e4370bac
+ Hash: 72cb0723583d3f5e900c39759fa4a141
TypeTreeHash:
serializedVersion: 2
Hash: 9a2ca7bdbd1871f7131daf57de908e0c
@@ -16,9 +16,10 @@ Assets:
- Assets/Resources/Sfx/games/marchingOrders/en/attention1.ogg
- Assets/Resources/Sfx/games/marchingOrders/en/attention2.ogg
- Assets/Resources/Sfx/games/marchingOrders/en/rightFaceTurn3fast.ogg
-- Assets/Resources/Sfx/games/marchingOrders/en/leftFaceTurn2fast.ogg
+- Assets/Resources/Sfx/games/marchingOrders/en/rightFaceTurn2fast.ogg
- Assets/Resources/Sfx/games/marchingOrders/en/leftFaceTurn1.ogg
- Assets/Resources/Sfx/games/marchingOrders/en/march1.ogg
+- Assets/Resources/Sfx/games/marchingOrders/en/leftFaceTurn2fast.ogg
- Assets/Resources/Sfx/games/marchingOrders/en/attention3.ogg
- Assets/Resources/Sfx/games/marchingOrders/en/leftFaceTurn3.ogg
- Assets/Resources/Sfx/games/marchingOrders/en/leftFaceTurn2.ogg
@@ -26,7 +27,6 @@ Assets:
- Assets/Resources/Sfx/games/marchingOrders/en/march3.ogg
- Assets/Resources/Sfx/games/marchingOrders/en/leftFaceTurn1fast.ogg
- Assets/Resources/Sfx/games/marchingOrders/en/rightFaceTurn1.ogg
-- Assets/Resources/Sfx/games/marchingOrders/en/rightFaceTurn2fast.ogg
- Assets/Resources/Sfx/games/marchingOrders/en/leftFaceTurn3fast.ogg
- Assets/Resources/Sfx/games/marchingOrders/en/rightFaceTurn3.ogg
- Assets/Resources/Sfx/games/marchingOrders/en/halt1.ogg
diff --git a/Assets/StreamingAssets/karate/common b/Assets/StreamingAssets/karate/common
index 2ac55c7a..90616fdf 100644
Binary files a/Assets/StreamingAssets/karate/common and b/Assets/StreamingAssets/karate/common differ
diff --git a/Assets/StreamingAssets/karate/common.manifest b/Assets/StreamingAssets/karate/common.manifest
index 2e1cfbbd..63aef358 100644
--- a/Assets/StreamingAssets/karate/common.manifest
+++ b/Assets/StreamingAssets/karate/common.manifest
@@ -1,9 +1,9 @@
ManifestFileVersion: 0
-CRC: 267694931
+CRC: 1546228825
Hashes:
AssetFileHash:
serializedVersion: 2
- Hash: ac8dfc11a7dd479a544b25bc6e6b152a
+ Hash: cd675f415fa478e57341ee08736f551b
TypeTreeHash:
serializedVersion: 2
Hash: 98a6d4eb4172ec02b55d5f14afb2d5a8
diff --git a/Assets/StreamingAssets/ntridol/common b/Assets/StreamingAssets/ntridol/common
index 0d191416..49f4c16e 100644
Binary files a/Assets/StreamingAssets/ntridol/common and b/Assets/StreamingAssets/ntridol/common differ
diff --git a/Assets/StreamingAssets/ntridol/common.manifest b/Assets/StreamingAssets/ntridol/common.manifest
index 8c4d3a93..a73e516d 100644
--- a/Assets/StreamingAssets/ntridol/common.manifest
+++ b/Assets/StreamingAssets/ntridol/common.manifest
@@ -1,9 +1,9 @@
ManifestFileVersion: 0
-CRC: 3271251889
+CRC: 352212143
Hashes:
AssetFileHash:
serializedVersion: 2
- Hash: fa8f6be17f9cb26e18d3027ce53d73da
+ Hash: ae8587d5871f6e87fe3ef335a91a5dd3
TypeTreeHash:
serializedVersion: 2
Hash: 6c542f6873f7e3067be67f888d87c947