diff --git a/Assets/Resources/Games/coinToss.prefab b/Assets/Resources/Games/coinToss.prefab
index 240a57be0..986773e7c 100644
--- a/Assets/Resources/Games/coinToss.prefab
+++ b/Assets/Resources/Games/coinToss.prefab
@@ -25,7 +25,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1491714170662666650}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
- m_LocalPosition: {x: -2.15, y: 4.96, z: 0}
+ m_LocalPosition: {x: -4.3, y: 9.92, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 2083908003750235240}
@@ -108,7 +108,7 @@ Transform:
m_GameObject: {fileID: 4255918877615705356}
m_LocalRotation: {x: -0, y: -0, z: -0.7071068, w: 0.7071068}
m_LocalPosition: {x: 0, y: 0, z: 0}
- m_LocalScale: {x: 1, y: 1, z: 1}
+ m_LocalScale: {x: 0.5, y: 0.5, z: 1}
m_Children: []
m_Father: {fileID: 3170172331476655201}
m_RootOrder: 0
@@ -189,7 +189,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4297773475502933893}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
- m_LocalPosition: {x: -2.12, y: 0.9, z: 0}
+ m_LocalPosition: {x: -4.24, y: 1.8, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 2083908003750235240}
@@ -272,7 +272,7 @@ Transform:
m_GameObject: {fileID: 4499006981041317361}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: -4.520001, y: 0.78000045, z: 0}
- m_LocalScale: {x: 1, y: 1, z: 1}
+ m_LocalScale: {x: 0.5, y: 0.5, z: 1}
m_Children:
- {fileID: 1615845594994777750}
- {fileID: 7476450758015735169}
@@ -439,7 +439,7 @@ Transform:
m_GameObject: {fileID: 5008687997479124527}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
- m_LocalScale: {x: 14.9296875, y: 8.525, z: 1}
+ m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 8906338938816874952}
m_RootOrder: 1
@@ -484,7 +484,7 @@ SpriteRenderer:
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: -9
- m_Sprite: {fileID: -2413806693520163455, guid: ebe73ca9363db456bacf42c025bb4847, type: 3}
+ m_Sprite: {fileID: 21300000, guid: 9c7b469fa013d7f4582d8c430ee498dd, type: 3}
m_Color: {r: 1, g: 1, b: 0.514151, a: 1}
m_FlipX: 0
m_FlipY: 0
@@ -520,7 +520,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7629969691203504755}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
- m_LocalPosition: {x: -2.72, y: 1.83, z: 0}
+ m_LocalPosition: {x: -5.44, y: 3.66, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 2083908003750235240}
diff --git a/Assets/Resources/Games/marchingOrders.prefab b/Assets/Resources/Games/marchingOrders.prefab
index 8a22baa03..2e3e84af8 100644
--- a/Assets/Resources/Games/marchingOrders.prefab
+++ b/Assets/Resources/Games/marchingOrders.prefab
@@ -235,7 +235,7 @@ SpriteRenderer:
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: -999
- m_Sprite: {fileID: 21300000, guid: 65caaace2b6e39445ba0a38f6afbef38, type: 3}
+ m_Sprite: {fileID: 21300000, guid: 66a6cd5f73aca9e45b38ac0906e541d7, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 0.5254902}
m_FlipX: 0
m_FlipY: 0
@@ -528,7 +528,7 @@ Transform:
- {fileID: 4516561034748738355}
- {fileID: 4676267018483621227}
m_Father: {fileID: 4161079182365989534}
- m_RootOrder: 3
+ m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!212 &4986707985294744365
SpriteRenderer:
@@ -663,6 +663,88 @@ SpriteRenderer:
m_WasSpriteAssigned: 1
m_MaskInteraction: 0
m_SpriteSortPoint: 0
+--- !u!1 &5059738567494280553
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 6332392593325199207}
+ - component: {fileID: 2833412293318203545}
+ m_Layer: 0
+ m_Name: reference2 (2)
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 0
+--- !u!4 &6332392593325199207
+Transform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 5059738567494280553}
+ m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+ m_LocalPosition: {x: -6.655, y: 2.708, z: 0}
+ m_LocalScale: {x: 3.503, y: 3.503, z: 6.0980606}
+ m_Children: []
+ m_Father: {fileID: 4161079182365989534}
+ m_RootOrder: 3
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!212 &2833412293318203545
+SpriteRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 5059738567494280553}
+ m_Enabled: 1
+ m_CastShadows: 0
+ m_ReceiveShadows: 0
+ m_DynamicOccludee: 1
+ m_MotionVectors: 1
+ m_LightProbeUsage: 1
+ m_ReflectionProbeUsage: 1
+ m_RayTracingMode: 0
+ m_RayTraceProcedural: 0
+ m_RenderingLayerMask: 1
+ m_RendererPriority: 0
+ m_Materials:
+ - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0}
+ m_StaticBatchInfo:
+ firstSubMesh: 0
+ subMeshCount: 0
+ m_StaticBatchRoot: {fileID: 0}
+ m_ProbeAnchor: {fileID: 0}
+ m_LightProbeVolumeOverride: {fileID: 0}
+ m_ScaleInLightmap: 1
+ m_ReceiveGI: 1
+ m_PreserveUVs: 0
+ m_IgnoreNormalsForChartDetection: 0
+ m_ImportantGI: 0
+ m_StitchLightmapSeams: 1
+ m_SelectedEditorRenderState: 0
+ m_MinimumChartSize: 4
+ m_AutoUVMaxDistance: 0.5
+ m_AutoUVMaxAngle: 89
+ m_LightmapParameters: {fileID: 0}
+ m_SortingLayerID: 0
+ m_SortingLayer: 0
+ m_SortingOrder: 20
+ m_Sprite: {fileID: 21300000, guid: 499e0723dc13a7c44b311fe80e9d040a, type: 3}
+ m_Color: {r: 1, g: 1, b: 1, a: 0.5254902}
+ m_FlipX: 0
+ m_FlipY: 0
+ m_DrawMode: 0
+ m_Size: {x: 5.12, y: 5.12}
+ m_AdaptiveModeThreshold: 0.5
+ m_SpriteTileMode: 0
+ m_WasSpriteAssigned: 1
+ m_MaskInteraction: 0
+ m_SpriteSortPoint: 0
--- !u!1 &5863847991924868836
GameObject:
m_ObjectHideFlags: 0
@@ -778,7 +860,7 @@ Transform:
- {fileID: 7162401519775036327}
- {fileID: 1064554344987815213}
m_Father: {fileID: 4161079182365989534}
- m_RootOrder: 4
+ m_RootOrder: 5
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!212 &4811943280779304315
SpriteRenderer:
@@ -1209,6 +1291,7 @@ Transform:
- {fileID: 1645939037775820338}
- {fileID: 753652905386637204}
- {fileID: 4777331550290145985}
+ - {fileID: 6332392593325199207}
- {fileID: 1558448215581441312}
- {fileID: 708937727427539446}
- {fileID: 621557526845520064}
@@ -1362,7 +1445,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 308962927016676861, guid: 263eb1d1933d9544a8db7c1844e53bb6, type: 3}
propertyPath: m_RootOrder
- value: 5
+ value: 6
objectReference: {fileID: 0}
- target: {fileID: 308962927016676861, guid: 263eb1d1933d9544a8db7c1844e53bb6, type: 3}
propertyPath: m_LocalPosition.x
@@ -1646,7 +1729,7 @@ PrefabInstance:
m_Modifications:
- target: {fileID: 308962927016676861, guid: 263eb1d1933d9544a8db7c1844e53bb6, type: 3}
propertyPath: m_RootOrder
- value: 7
+ value: 8
objectReference: {fileID: 0}
- target: {fileID: 308962927016676861, guid: 263eb1d1933d9544a8db7c1844e53bb6, type: 3}
propertyPath: m_LocalPosition.x
@@ -1722,7 +1805,7 @@ PrefabInstance:
m_Modifications:
- target: {fileID: 308962927016676861, guid: 263eb1d1933d9544a8db7c1844e53bb6, type: 3}
propertyPath: m_RootOrder
- value: 6
+ value: 7
objectReference: {fileID: 0}
- target: {fileID: 308962927016676861, guid: 263eb1d1933d9544a8db7c1844e53bb6, type: 3}
propertyPath: m_LocalPosition.x
@@ -1798,7 +1881,7 @@ PrefabInstance:
m_Modifications:
- target: {fileID: 308962927016676861, guid: 263eb1d1933d9544a8db7c1844e53bb6, type: 3}
propertyPath: m_RootOrder
- value: 8
+ value: 9
objectReference: {fileID: 0}
- target: {fileID: 308962927016676861, guid: 263eb1d1933d9544a8db7c1844e53bb6, type: 3}
propertyPath: m_LocalPosition.x
diff --git a/Assets/Resources/Sfx/games/coinToss/cowbell1.wav b/Assets/Resources/Sfx/games/coinToss/cowbell1.wav
new file mode 100644
index 000000000..b95225a34
Binary files /dev/null and b/Assets/Resources/Sfx/games/coinToss/cowbell1.wav differ
diff --git a/Assets/Resources/Sfx/games/coinToss/cowbell1.wav.meta b/Assets/Resources/Sfx/games/coinToss/cowbell1.wav.meta
new file mode 100644
index 000000000..52203cb33
--- /dev/null
+++ b/Assets/Resources/Sfx/games/coinToss/cowbell1.wav.meta
@@ -0,0 +1,22 @@
+fileFormatVersion: 2
+guid: 2117b13e395760e45884a5ea5e8b731b
+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:
diff --git a/Assets/Resources/Sfx/games/coinToss/cowbell2.wav b/Assets/Resources/Sfx/games/coinToss/cowbell2.wav
new file mode 100644
index 000000000..bf6aca158
Binary files /dev/null and b/Assets/Resources/Sfx/games/coinToss/cowbell2.wav differ
diff --git a/Assets/Resources/Sfx/games/coinToss/cowbell2.wav.meta b/Assets/Resources/Sfx/games/coinToss/cowbell2.wav.meta
new file mode 100644
index 000000000..a8e245c4b
--- /dev/null
+++ b/Assets/Resources/Sfx/games/coinToss/cowbell2.wav.meta
@@ -0,0 +1,22 @@
+fileFormatVersion: 2
+guid: 852b8ee6cf40b884d8f384f8891367c1
+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:
diff --git a/Assets/Resources/Sprites/Games/CoinToss/Animations/Catch_empty.anim b/Assets/Resources/Sprites/Games/CoinToss/Animations/Catch_empty.anim
index c3bbd42c5..3e86aee57 100644
--- a/Assets/Resources/Sprites/Games/CoinToss/Animations/Catch_empty.anim
+++ b/Assets/Resources/Sprites/Games/CoinToss/Animations/Catch_empty.anim
@@ -21,7 +21,7 @@ AnimationClip:
- serializedVersion: 3
time: 0
value: {x: -4.52, y: 0.67, z: 0}
- inSlope: {x: 0, y: Infinity, z: 0}
+ inSlope: {x: Infinity, y: Infinity, z: Infinity}
outSlope: {x: 0, y: Infinity, z: 0}
tangentMode: 0
weightedMode: 0
@@ -30,7 +30,7 @@ AnimationClip:
- serializedVersion: 3
time: 0.1
value: {x: -4.52, y: 0.82, z: 0}
- inSlope: {x: 0, y: 0.40000042, z: 0}
+ inSlope: {x: Infinity, y: Infinity, z: Infinity}
outSlope: {x: 0, y: 0.40000042, z: 0}
tangentMode: 0
weightedMode: 0
@@ -46,7 +46,7 @@ AnimationClip:
- serializedVersion: 3
time: 0
value: {x: 0, y: -0.14, z: 0}
- inSlope: {x: 0, y: Infinity, z: 0}
+ inSlope: {x: Infinity, y: Infinity, z: Infinity}
outSlope: {x: 0, y: Infinity, z: 0}
tangentMode: 0
weightedMode: 0
@@ -55,7 +55,7 @@ AnimationClip:
- serializedVersion: 3
time: 0.1
value: {x: 0, y: 0, z: 0}
- inSlope: {x: 0, y: 0, z: 0}
+ inSlope: {x: Infinity, y: Infinity, z: Infinity}
outSlope: {x: 0, y: 0, z: 0}
tangentMode: 0
weightedMode: 0
@@ -158,18 +158,18 @@ AnimationClip:
- serializedVersion: 3
time: 0
value: -4.52
- inSlope: 0
+ inSlope: Infinity
outSlope: 0
- tangentMode: 136
+ tangentMode: 7
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.1
value: -4.52
- inSlope: 0
+ inSlope: Infinity
outSlope: 0
- tangentMode: 136
+ tangentMode: 7
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
@@ -188,16 +188,16 @@ AnimationClip:
value: 0.67
inSlope: Infinity
outSlope: Infinity
- tangentMode: 0
+ tangentMode: 7
weightedMode: 0
inWeight: 0.33333334
outWeight: 0
- serializedVersion: 3
time: 0.1
value: 0.82
- inSlope: 0.40000042
+ inSlope: Infinity
outSlope: 0.40000042
- tangentMode: 0
+ tangentMode: 7
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
@@ -214,18 +214,18 @@ AnimationClip:
- serializedVersion: 3
time: 0
value: 0
- inSlope: 0
+ inSlope: Infinity
outSlope: 0
- tangentMode: 136
+ tangentMode: 7
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.1
value: 0
- inSlope: 0
+ inSlope: Infinity
outSlope: 0
- tangentMode: 136
+ tangentMode: 7
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
@@ -242,18 +242,18 @@ AnimationClip:
- serializedVersion: 3
time: 0
value: 0
- inSlope: 0
+ inSlope: Infinity
outSlope: 0
- tangentMode: 136
+ tangentMode: 7
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.1
value: 0
- inSlope: 0
+ inSlope: Infinity
outSlope: 0
- tangentMode: 136
+ tangentMode: 7
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
@@ -272,16 +272,16 @@ AnimationClip:
value: -0.14
inSlope: Infinity
outSlope: Infinity
- tangentMode: 0
+ tangentMode: 7
weightedMode: 0
inWeight: 0.33333334
outWeight: 0
- serializedVersion: 3
time: 0.1
value: 0
- inSlope: 0
+ inSlope: Infinity
outSlope: 0
- tangentMode: 136
+ tangentMode: 7
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
@@ -298,18 +298,18 @@ AnimationClip:
- serializedVersion: 3
time: 0
value: 0
- inSlope: 0
+ inSlope: Infinity
outSlope: 0
- tangentMode: 136
+ tangentMode: 7
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.1
value: 0
- inSlope: 0
+ inSlope: Infinity
outSlope: 0
- tangentMode: 136
+ tangentMode: 7
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
diff --git a/Assets/Resources/Sprites/Games/CoinToss/Animations/Catch_success.anim b/Assets/Resources/Sprites/Games/CoinToss/Animations/Catch_success.anim
index b0125f4ab..5f1f7cd72 100644
--- a/Assets/Resources/Sprites/Games/CoinToss/Animations/Catch_success.anim
+++ b/Assets/Resources/Sprites/Games/CoinToss/Animations/Catch_success.anim
@@ -47,7 +47,7 @@ AnimationClip:
outWeight: {x: 0.33333334, y: 0, z: 0.33333334}
- serializedVersion: 3
time: 0.35
- value: {x: -4.52, y: 0.914, z: 0}
+ value: {x: -4.52, y: 0.894, z: 0}
inSlope: {x: 0, y: Infinity, z: 0}
outSlope: {x: 0, y: Infinity, z: 0}
tangentMode: 0
@@ -363,7 +363,7 @@ AnimationClip:
outWeight: 0
- serializedVersion: 3
time: 0.35
- value: 0.914
+ value: 0.894
inSlope: Infinity
outSlope: Infinity
tangentMode: 0
diff --git a/Assets/Resources/Sprites/Games/CoinToss/Animations/Pickup.anim b/Assets/Resources/Sprites/Games/CoinToss/Animations/Pickup.anim
index d87642ef0..2d885fb0b 100644
--- a/Assets/Resources/Sprites/Games/CoinToss/Animations/Pickup.anim
+++ b/Assets/Resources/Sprites/Games/CoinToss/Animations/Pickup.anim
@@ -63,7 +63,7 @@ AnimationClip:
m_Curve:
- serializedVersion: 3
time: 0
- value: {x: -2.2, y: 0.93, z: 0}
+ value: {x: -4.24, y: 1.8, z: 0}
inSlope: {x: 0, y: 0, z: 0}
outSlope: {x: 0, y: 0, z: 0}
tangentMode: 0
@@ -72,7 +72,7 @@ AnimationClip:
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
- serializedVersion: 3
time: 0.41666666
- value: {x: -6.02, y: 3.07, z: 0}
+ value: {x: -12.04, y: 6.14, z: 0}
inSlope: {x: 0, y: 0, z: 0}
outSlope: {x: 0, y: 0, z: 0}
tangentMode: 0
@@ -81,7 +81,7 @@ AnimationClip:
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
- serializedVersion: 3
time: 0.46666667
- value: {x: -2.04, y: 0.94, z: 0}
+ value: {x: -4.24, y: 1.8, z: 0}
inSlope: {x: 0, y: 0, z: 0}
outSlope: {x: 0, y: 0, z: 0}
tangentMode: 0
@@ -658,7 +658,7 @@ AnimationClip:
m_Curve:
- serializedVersion: 3
time: 0
- value: -2.2
+ value: -4.24
inSlope: 0
outSlope: 0
tangentMode: 136
@@ -667,7 +667,7 @@ AnimationClip:
outWeight: 0.33333334
- serializedVersion: 3
time: 0.41666666
- value: -6.02
+ value: -12.04
inSlope: 0
outSlope: 0
tangentMode: 136
@@ -676,7 +676,7 @@ AnimationClip:
outWeight: 0.33333334
- serializedVersion: 3
time: 0.46666667
- value: -2.04
+ value: -4.24
inSlope: 0
outSlope: 0
tangentMode: 136
@@ -695,7 +695,7 @@ AnimationClip:
m_Curve:
- serializedVersion: 3
time: 0
- value: 0.93
+ value: 1.8
inSlope: 0
outSlope: 0
tangentMode: 136
@@ -704,7 +704,7 @@ AnimationClip:
outWeight: 0.33333334
- serializedVersion: 3
time: 0.41666666
- value: 3.07
+ value: 6.14
inSlope: 0
outSlope: 0
tangentMode: 136
@@ -713,7 +713,7 @@ AnimationClip:
outWeight: 0.33333334
- serializedVersion: 3
time: 0.46666667
- value: 0.94
+ value: 1.8
inSlope: 0
outSlope: 0
tangentMode: 136
diff --git a/Assets/Resources/Sprites/Games/CoinToss/Animations/Throw.anim b/Assets/Resources/Sprites/Games/CoinToss/Animations/Throw.anim
index c4c31372d..d00f90489 100644
--- a/Assets/Resources/Sprites/Games/CoinToss/Animations/Throw.anim
+++ b/Assets/Resources/Sprites/Games/CoinToss/Animations/Throw.anim
@@ -21,7 +21,7 @@ AnimationClip:
- serializedVersion: 3
time: 0
value: {x: -4.52, y: 1.57, z: 0}
- inSlope: {x: 0, y: 0, z: 0}
+ inSlope: {x: Infinity, y: Infinity, z: Infinity}
outSlope: {x: 0, y: 0, z: 0}
tangentMode: 0
weightedMode: 0
@@ -30,7 +30,7 @@ AnimationClip:
- serializedVersion: 3
time: 0.083333336
value: {x: -4.52, y: 1.55, z: 0}
- inSlope: {x: 0, y: 0, z: 0}
+ inSlope: {x: Infinity, y: Infinity, z: Infinity}
outSlope: {x: 0, y: 0, z: 0}
tangentMode: 0
weightedMode: 0
@@ -46,7 +46,7 @@ AnimationClip:
- serializedVersion: 3
time: 0
value: {x: 0, y: 0.47, z: 0}
- inSlope: {x: 0, y: 0, z: 0}
+ inSlope: {x: Infinity, y: Infinity, z: Infinity}
outSlope: {x: 0, y: 0, z: 0}
tangentMode: 0
weightedMode: 0
@@ -55,7 +55,7 @@ AnimationClip:
- serializedVersion: 3
time: 0.083333336
value: {x: 0, y: 0.3, z: 0}
- inSlope: {x: 0, y: 0, z: 0}
+ inSlope: {x: Infinity, y: Infinity, z: Infinity}
outSlope: {x: 0, y: 0, z: 0}
tangentMode: 0
weightedMode: 0
@@ -196,18 +196,18 @@ AnimationClip:
- serializedVersion: 3
time: 0
value: -4.52
- inSlope: 0
+ inSlope: Infinity
outSlope: 0
- tangentMode: 136
+ tangentMode: 7
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.083333336
value: -4.52
- inSlope: 0
+ inSlope: Infinity
outSlope: 0
- tangentMode: 136
+ tangentMode: 7
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
@@ -224,18 +224,18 @@ AnimationClip:
- serializedVersion: 3
time: 0
value: 1.57
- inSlope: 0
+ inSlope: Infinity
outSlope: 0
- tangentMode: 136
+ tangentMode: 7
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.083333336
value: 1.55
- inSlope: 0
+ inSlope: Infinity
outSlope: 0
- tangentMode: 136
+ tangentMode: 7
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
@@ -252,18 +252,18 @@ AnimationClip:
- serializedVersion: 3
time: 0
value: 0
- inSlope: 0
+ inSlope: Infinity
outSlope: 0
- tangentMode: 136
+ tangentMode: 7
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.083333336
value: 0
- inSlope: 0
+ inSlope: Infinity
outSlope: 0
- tangentMode: 136
+ tangentMode: 7
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
@@ -280,18 +280,18 @@ AnimationClip:
- serializedVersion: 3
time: 0
value: 0
- inSlope: 0
+ inSlope: Infinity
outSlope: 0
- tangentMode: 136
+ tangentMode: 7
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.083333336
value: 0
- inSlope: 0
+ inSlope: Infinity
outSlope: 0
- tangentMode: 136
+ tangentMode: 7
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
@@ -308,18 +308,18 @@ AnimationClip:
- serializedVersion: 3
time: 0
value: 0.47
- inSlope: 0
+ inSlope: Infinity
outSlope: 0
- tangentMode: 136
+ tangentMode: 7
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.083333336
value: 0.3
- inSlope: 0
+ inSlope: Infinity
outSlope: 0
- tangentMode: 136
+ tangentMode: 7
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
@@ -336,18 +336,18 @@ AnimationClip:
- serializedVersion: 3
time: 0
value: 0
- inSlope: 0
+ inSlope: Infinity
outSlope: 0
- tangentMode: 136
+ tangentMode: 7
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.083333336
value: 0
- inSlope: 0
+ inSlope: Infinity
outSlope: 0
- tangentMode: 136
+ tangentMode: 7
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
diff --git a/Assets/Resources/Sprites/Games/CoinToss/foreground.png b/Assets/Resources/Sprites/Games/CoinToss/foreground.png
new file mode 100644
index 000000000..4f16a1f86
Binary files /dev/null and b/Assets/Resources/Sprites/Games/CoinToss/foreground.png differ
diff --git a/Assets/Resources/Sprites/Games/CoinToss/foreground.png.meta b/Assets/Resources/Sprites/Games/CoinToss/foreground.png.meta
new file mode 100644
index 000000000..3f21b0501
--- /dev/null
+++ b/Assets/Resources/Sprites/Games/CoinToss/foreground.png.meta
@@ -0,0 +1,96 @@
+fileFormatVersion: 2
+guid: 9c7b469fa013d7f4582d8c430ee498dd
+TextureImporter:
+ internalIDToNameTable: []
+ externalObjects: {}
+ serializedVersion: 11
+ mipmaps:
+ mipMapMode: 0
+ enableMipMap: 0
+ sRGBTexture: 1
+ linearTexture: 0
+ fadeOut: 0
+ borderMipMap: 0
+ mipMapsPreserveCoverage: 0
+ alphaTestReferenceValue: 0.5
+ mipMapFadeDistanceStart: 1
+ mipMapFadeDistanceEnd: 3
+ bumpmap:
+ convertToNormalMap: 0
+ externalNormalMap: 0
+ heightScale: 0.25
+ normalMapFilter: 0
+ isReadable: 0
+ streamingMipmaps: 0
+ streamingMipmapsPriority: 0
+ vTOnly: 0
+ grayScaleToAlpha: 0
+ generateCubemap: 6
+ cubemapConvolution: 0
+ seamlessCubemap: 0
+ textureFormat: 1
+ maxTextureSize: 2048
+ textureSettings:
+ serializedVersion: 2
+ filterMode: 1
+ aniso: 1
+ mipBias: 0
+ wrapU: 1
+ wrapV: 1
+ wrapW: 1
+ nPOTScale: 0
+ lightmap: 0
+ compressionQuality: 50
+ spriteMode: 1
+ spriteExtrude: 1
+ spriteMeshType: 1
+ alignment: 0
+ spritePivot: {x: 0.5, y: 0.5}
+ spritePixelsToUnits: 100
+ spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+ spriteGenerateFallbackPhysicsShape: 1
+ alphaUsage: 1
+ alphaIsTransparency: 1
+ spriteTessellationDetail: -1
+ textureType: 8
+ textureShape: 1
+ singleChannelComponent: 0
+ flipbookRows: 1
+ flipbookColumns: 1
+ maxTextureSizeSet: 0
+ compressionQualitySet: 0
+ textureFormatSet: 0
+ ignorePngGamma: 0
+ applyGammaDecoding: 0
+ platformSettings:
+ - serializedVersion: 3
+ buildTarget: DefaultTexturePlatform
+ maxTextureSize: 2048
+ resizeAlgorithm: 0
+ textureFormat: -1
+ textureCompression: 1
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 0
+ androidETC2FallbackOverride: 0
+ forceMaximumCompressionQuality_BC6H_BC7: 0
+ spriteSheet:
+ serializedVersion: 2
+ sprites: []
+ outline: []
+ physicsShape: []
+ bones: []
+ spriteID: 5e97eb03825dee720800000000000000
+ internalID: 0
+ vertices: []
+ indices:
+ edges: []
+ weights: []
+ secondaryTextures: []
+ spritePackingTag:
+ pSDRemoveMatte: 0
+ pSDShowRemoveMatteOption: 0
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Resources/Sprites/Games/CoinToss/sprsh_cointoss.png b/Assets/Resources/Sprites/Games/CoinToss/sprsh_cointoss.png
index 9e7edfbc5..f490a719e 100644
Binary files a/Assets/Resources/Sprites/Games/CoinToss/sprsh_cointoss.png and b/Assets/Resources/Sprites/Games/CoinToss/sprsh_cointoss.png differ
diff --git a/Assets/Resources/Sprites/Games/CoinToss/sprsh_cointoss.png.meta b/Assets/Resources/Sprites/Games/CoinToss/sprsh_cointoss.png.meta
index 919343fa0..823ee35e2 100644
--- a/Assets/Resources/Sprites/Games/CoinToss/sprsh_cointoss.png.meta
+++ b/Assets/Resources/Sprites/Games/CoinToss/sprsh_cointoss.png.meta
@@ -104,10 +104,10 @@ TextureImporter:
platformSettings:
- serializedVersion: 3
buildTarget: DefaultTexturePlatform
- maxTextureSize: 2048
+ maxTextureSize: 4096
resizeAlgorithm: 0
textureFormat: -1
- textureCompression: 1
+ textureCompression: 2
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
@@ -116,10 +116,22 @@ TextureImporter:
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: Standalone
- maxTextureSize: 2048
+ maxTextureSize: 4096
resizeAlgorithm: 0
textureFormat: -1
- textureCompression: 1
+ textureCompression: 2
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 0
+ androidETC2FallbackOverride: 0
+ forceMaximumCompressionQuality_BC6H_BC7: 0
+ - serializedVersion: 3
+ buildTarget: WebGL
+ maxTextureSize: 4096
+ resizeAlgorithm: 0
+ textureFormat: -1
+ textureCompression: 2
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
@@ -134,9 +146,9 @@ TextureImporter:
rect:
serializedVersion: 2
x: 0
- y: 1700
- width: 668
- height: 344
+ y: 3400
+ width: 1336
+ height: 688
alignment: 0
pivot: {x: 0.5, y: 0.5}
border: {x: 0, y: 0, z: 0, w: 0}
@@ -155,9 +167,9 @@ TextureImporter:
rect:
serializedVersion: 2
x: 0
- y: 1284
- width: 664
- height: 406
+ y: 2568
+ width: 1328
+ height: 812
alignment: 0
pivot: {x: 0.5, y: 0.5}
border: {x: 0, y: 0, z: 0, w: 0}
@@ -176,9 +188,9 @@ TextureImporter:
rect:
serializedVersion: 2
x: 0
- y: 836
- width: 666
- height: 438
+ y: 1672
+ width: 1332
+ height: 876
alignment: 0
pivot: {x: 0.5, y: 0.5}
border: {x: 0, y: 0, z: 0, w: 0}
@@ -197,9 +209,9 @@ TextureImporter:
rect:
serializedVersion: 2
x: 0
- y: 390
- width: 668
- height: 438
+ y: 780
+ width: 1336
+ height: 876
alignment: 0
pivot: {x: 0.5, y: 0.5}
border: {x: 0, y: 0, z: 0, w: 0}
@@ -218,9 +230,9 @@ TextureImporter:
rect:
serializedVersion: 2
x: 0
- y: 70
- width: 860
- height: 310
+ y: 140
+ width: 1720
+ height: 620
alignment: 0
pivot: {x: 0.5, y: 0.5}
border: {x: 0, y: 0, z: 0, w: 0}
@@ -238,10 +250,10 @@ TextureImporter:
name: sprsh_cointoss_closed_90
rect:
serializedVersion: 2
- x: 676
- y: 1668
- width: 726
- height: 380
+ x: 1352
+ y: 3336
+ width: 1452
+ height: 752
alignment: 0
pivot: {x: 0.5, y: 0.5}
border: {x: 0, y: 0, z: 0, w: 0}
@@ -259,10 +271,10 @@ TextureImporter:
name: sprsh_cointoss_closed_45
rect:
serializedVersion: 2
- x: 676
- y: 1286
- width: 728
- height: 374
+ x: 1352
+ y: 2572
+ width: 1456
+ height: 748
alignment: 0
pivot: {x: 0.5, y: 0.5}
border: {x: 0, y: 0, z: 0, w: 0}
@@ -280,10 +292,10 @@ TextureImporter:
name: sprsh_cointoss_closed_01
rect:
serializedVersion: 2
- x: 676
- y: 900
- width: 728
- height: 376
+ x: 1352
+ y: 1800
+ width: 1456
+ height: 752
alignment: 0
pivot: {x: 0.5, y: 0.5}
border: {x: 0, y: 0, z: 0, w: 0}
@@ -301,10 +313,10 @@ TextureImporter:
name: sprsh_cointoss_closed_02
rect:
serializedVersion: 2
- x: 676
- y: 486
- width: 728
- height: 404
+ x: 1352
+ y: 972
+ width: 1456
+ height: 808
alignment: 0
pivot: {x: 0.5, y: 0.5}
border: {x: 0, y: 0, z: 0, w: 0}
@@ -322,10 +334,10 @@ TextureImporter:
name: sprsh_cointoss_whoosh
rect:
serializedVersion: 2
- x: 1412
- y: 1092
- width: 184
- height: 920
+ x: 2824
+ y: 2184
+ width: 368
+ height: 1840
alignment: 0
pivot: {x: 0.5, y: 0.5}
border: {x: 0, y: 0, z: 0, w: 0}
@@ -343,10 +355,10 @@ TextureImporter:
name: sprsh_cointoss_sleeve
rect:
serializedVersion: 2
- x: 1606
- y: 1350
- width: 344
- height: 566
+ x: 3212
+ y: 2700
+ width: 688
+ height: 1132
alignment: 0
pivot: {x: 0.5, y: 0.5}
border: {x: 0, y: 0, z: 0, w: 0}
@@ -364,10 +376,10 @@ TextureImporter:
name: sprsh_cointoss_45
rect:
serializedVersion: 2
- x: 1829
- y: 1094
- width: 215
- height: 212
+ x: 3658
+ y: 2188
+ width: 430
+ height: 424
alignment: 0
pivot: {x: 0.5, y: 0.5}
border: {x: 0, y: 0, z: 0, w: 0}
@@ -385,10 +397,10 @@ TextureImporter:
name: sprsh_cointoss_shockwave
rect:
serializedVersion: 2
- x: 1604
- y: 1092
- width: 216
- height: 216
+ x: 3208
+ y: 2184
+ width: 432
+ height: 432
alignment: 0
pivot: {x: 0.5, y: 0.5}
border: {x: 0, y: 0, z: 0, w: 0}
diff --git a/Assets/Resources/Sprites/Games/MarchingOrders/References/allreferences.pdn b/Assets/Resources/Sprites/Games/MarchingOrders/References/allreferences.pdn
new file mode 100644
index 000000000..9825ac6f6
Binary files /dev/null and b/Assets/Resources/Sprites/Games/MarchingOrders/References/allreferences.pdn differ
diff --git a/Assets/Resources/Sprites/Games/MarchingOrders/References/allreferences.pdn.meta b/Assets/Resources/Sprites/Games/MarchingOrders/References/allreferences.pdn.meta
new file mode 100644
index 000000000..52bec390b
--- /dev/null
+++ b/Assets/Resources/Sprites/Games/MarchingOrders/References/allreferences.pdn.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 7d385b172ddc26442beb37f7c617c850
+DefaultImporter:
+ externalObjects: {}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Resources/Sprites/Games/MarchingOrders/References/reference3.png b/Assets/Resources/Sprites/Games/MarchingOrders/References/reference3.png
new file mode 100644
index 000000000..546fb27eb
Binary files /dev/null and b/Assets/Resources/Sprites/Games/MarchingOrders/References/reference3.png differ
diff --git a/Assets/Resources/Sprites/Games/MarchingOrders/References/reference3.png.meta b/Assets/Resources/Sprites/Games/MarchingOrders/References/reference3.png.meta
new file mode 100644
index 000000000..bfbc718a3
--- /dev/null
+++ b/Assets/Resources/Sprites/Games/MarchingOrders/References/reference3.png.meta
@@ -0,0 +1,96 @@
+fileFormatVersion: 2
+guid: 66a6cd5f73aca9e45b38ac0906e541d7
+TextureImporter:
+ internalIDToNameTable: []
+ externalObjects: {}
+ serializedVersion: 11
+ mipmaps:
+ mipMapMode: 0
+ enableMipMap: 0
+ sRGBTexture: 1
+ linearTexture: 0
+ fadeOut: 0
+ borderMipMap: 0
+ mipMapsPreserveCoverage: 0
+ alphaTestReferenceValue: 0.5
+ mipMapFadeDistanceStart: 1
+ mipMapFadeDistanceEnd: 3
+ bumpmap:
+ convertToNormalMap: 0
+ externalNormalMap: 0
+ heightScale: 0.25
+ normalMapFilter: 0
+ isReadable: 0
+ streamingMipmaps: 0
+ streamingMipmapsPriority: 0
+ vTOnly: 0
+ grayScaleToAlpha: 0
+ generateCubemap: 6
+ cubemapConvolution: 0
+ seamlessCubemap: 0
+ textureFormat: 1
+ maxTextureSize: 2048
+ textureSettings:
+ serializedVersion: 2
+ filterMode: 1
+ aniso: 1
+ mipBias: 0
+ wrapU: 1
+ wrapV: 1
+ wrapW: 1
+ nPOTScale: 0
+ lightmap: 0
+ compressionQuality: 50
+ spriteMode: 1
+ spriteExtrude: 1
+ spriteMeshType: 1
+ alignment: 0
+ spritePivot: {x: 0.5, y: 0.5}
+ spritePixelsToUnits: 100
+ spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+ spriteGenerateFallbackPhysicsShape: 1
+ alphaUsage: 1
+ alphaIsTransparency: 1
+ spriteTessellationDetail: -1
+ textureType: 8
+ textureShape: 1
+ singleChannelComponent: 0
+ flipbookRows: 1
+ flipbookColumns: 1
+ maxTextureSizeSet: 0
+ compressionQualitySet: 0
+ textureFormatSet: 0
+ ignorePngGamma: 0
+ applyGammaDecoding: 0
+ platformSettings:
+ - serializedVersion: 3
+ buildTarget: DefaultTexturePlatform
+ maxTextureSize: 2048
+ resizeAlgorithm: 0
+ textureFormat: -1
+ textureCompression: 1
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 0
+ androidETC2FallbackOverride: 0
+ forceMaximumCompressionQuality_BC6H_BC7: 0
+ spriteSheet:
+ serializedVersion: 2
+ sprites: []
+ outline: []
+ physicsShape: []
+ bones: []
+ spriteID: 5e97eb03825dee720800000000000000
+ internalID: 0
+ vertices: []
+ indices:
+ edges: []
+ weights: []
+ secondaryTextures: []
+ spritePackingTag:
+ pSDRemoveMatte: 0
+ pSDShowRemoveMatteOption: 0
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Scripts/Games/CoinToss/CoinToss.cs b/Assets/Scripts/Games/CoinToss/CoinToss.cs
index b788d59b3..8d6776431 100644
--- a/Assets/Scripts/Games/CoinToss/CoinToss.cs
+++ b/Assets/Scripts/Games/CoinToss/CoinToss.cs
@@ -16,10 +16,11 @@ namespace HeavenStudio.Games.Loaders
{
new GameAction("toss", "Toss Coin")
{
- function = delegate { CoinToss.instance.TossCoin(eventCaller.currentEntity.beat, eventCaller.currentEntity["toggle"]); },
+ function = delegate { CoinToss.instance.TossCoin(eventCaller.currentEntity.beat, eventCaller.currentEntity["type"], eventCaller.currentEntity["toggle"]); },
defaultLength = 7,
parameters = new List()
{
+ new Param("type", CoinToss.CoinVariation.Default, "Variation", "Special Coin Variations"),
new Param("toggle", false, "Audience Reaction", "Enable Audience Reaction"),
}
},
@@ -130,6 +131,12 @@ namespace HeavenStudio.Games
public PlayerActionEvent coin;
+ public enum CoinVariation
+ {
+ Default,
+ Cowbell,
+ }
+
private void Awake()
{
instance = this;
@@ -148,7 +155,7 @@ namespace HeavenStudio.Games
//nothing
}
- public void TossCoin(float beat, bool audienceReacting)
+ public void TossCoin(float beat, int type, bool audienceReacting)
{
if (coin != null) return;
@@ -158,6 +165,23 @@ namespace HeavenStudio.Games
//Game state says the hand is throwing the coin
isThrowing = true;
+ switch (type)
+ {
+ case (int) CoinToss.CoinVariation.Cowbell:
+ MultiSound.Play(new MultiSound.Sound[] {
+ new MultiSound.Sound("coinToss/cowbell1", beat),
+ new MultiSound.Sound("coinToss/cowbell2", beat + 1f),
+ new MultiSound.Sound("coinToss/cowbell1", beat + 2f),
+ new MultiSound.Sound("coinToss/cowbell2", beat + 3f),
+ new MultiSound.Sound("coinToss/cowbell1", beat + 4f),
+ new MultiSound.Sound("coinToss/cowbell2", beat + 5f),
+ new MultiSound.Sound("coinToss/cowbell1", beat + 6f),
+ });
+ break;
+ default:
+ break;
+ }
+
this.audienceReacting = audienceReacting;
coin = ScheduleInput(beat, 6f, InputType.STANDARD_DOWN, CatchSuccess, CatchMiss, CatchEmpty);
diff --git a/Assets/Scripts/Games/MarchingOrders/MarchingOrders.cs b/Assets/Scripts/Games/MarchingOrders/MarchingOrders.cs
index 385518226..ab4558765 100644
--- a/Assets/Scripts/Games/MarchingOrders/MarchingOrders.cs
+++ b/Assets/Scripts/Games/MarchingOrders/MarchingOrders.cs
@@ -25,45 +25,45 @@ namespace HeavenStudio.Games.Loaders
return new Minigame("marchingOrders", "Marching Orders \n[WIP]", "00A43B", false, false, new List()
{
new GameAction("bop", "Bop")
- {
- function = delegate { var e = eventCaller.currentEntity; MarchingOrders.instance.Bop(e.beat, e.length); },
+ {
+ function = delegate { var e = eventCaller.currentEntity; MarchingOrders.instance.Bop(e.beat, e.length); },
defaultLength = 1f,
- resizable = true
- },
-
- new GameAction("marching", "Cadets March")
- {
- function = delegate { var e = eventCaller.currentEntity; MarchingOrders.instance.CadetsMarch(e.beat, e.length); },
+ resizable = true
+ },
+
+ new GameAction("marching", "Cadets March")
+ {
+ function = delegate { var e = eventCaller.currentEntity; MarchingOrders.instance.CadetsMarch(e.beat, e.length); },
defaultLength = 4f,
- resizable = true
- },
+ resizable = true
+ },
new GameAction("attention", "Attention...")
- {
- function = delegate { var e = eventCaller.currentEntity; MarchingOrders.instance.SargeAttention(e.beat); },
- defaultLength = 2.25f,
- inactiveFunction = delegate { var e = eventCaller.currentEntity; MarchingOrders.AttentionSound(e.beat);}
+ {
+ function = delegate { var e = eventCaller.currentEntity; MarchingOrders.instance.SargeAttention(e.beat); },
+ defaultLength = 2.25f,
+ inactiveFunction = delegate { var e = eventCaller.currentEntity; MarchingOrders.AttentionSound(e.beat);}
},
-
- new GameAction("march", "March!")
- {
- function = delegate { var e = eventCaller.currentEntity; MarchingOrders.instance.SargeMarch(e.beat); },
- defaultLength = 2f,
+
+ new GameAction("march", "March!")
+ {
+ function = delegate { var e = eventCaller.currentEntity; MarchingOrders.instance.SargeMarch(e.beat); },
+ defaultLength = 2f,
inactiveFunction = delegate { var e = eventCaller.currentEntity; MarchingOrders.MarchSound(e.beat);}
- },
-
- new GameAction("halt", "Halt!")
- {
- function = delegate { var e = eventCaller.currentEntity; MarchingOrders.instance.SargeHalt(e.beat); },
- defaultLength = 2f,
+ },
+
+ new GameAction("halt", "Halt!")
+ {
+ function = delegate { var e = eventCaller.currentEntity; MarchingOrders.instance.SargeHalt(e.beat); },
+ defaultLength = 2f,
inactiveFunction = delegate { var e = eventCaller.currentEntity; MarchingOrders.HaltSound(e.beat);}
},
-
- new GameAction("face turn", "Direction to Turn")
+
+ new GameAction("face turn", "Direction to Turn")
{
- function = delegate { var e = eventCaller.currentEntity; MarchingOrders.instance.SargeFaceTurn(e.beat, e["type"], e["type2"]); },
- defaultLength = 4f,
- parameters = new List()
+ function = delegate { var e = eventCaller.currentEntity; MarchingOrders.instance.SargeFaceTurn(e.beat, e["type"], e["type2"]); },
+ defaultLength = 4f,
+ parameters = new List()
{
new Param("type", MarchingOrders.DirectionFaceTurn.Right, "Direction", "The direction sarge wants the cadets to face"),
new Param("type2", MarchingOrders.FaceTurnLength.Normal, "Length", "How fast or slow the event lasts"),
@@ -79,36 +79,37 @@ namespace HeavenStudio.Games
//using Scripts_MarchingOrders;
public class MarchingOrders : Minigame
{
- //code is just copied from other minigame code, i will polish them later
- [Header("References")]
+ //code is just copied from other minigame code, i will polish them later
+ [Header("References")]
public Animator Sarge;
public Animator Cadet1;
public Animator Cadet2;
public Animator Cadet3;
- public Animator CadetPlayer;
- public Animator CadetHead1;
- public Animator CadetHead2;
- public Animator CadetHead3;
- public Animator CadetHeadPlayer;
-
+ public Animator CadetPlayer;
+ public Animator CadetHead1;
+ public Animator CadetHead2;
+ public Animator CadetHead3;
+ public Animator CadetHeadPlayer;
+
public GameObject Player;
-
- public GameEvent bop = new GameEvent();
- public GameEvent noBop = new GameEvent();
- public GameEvent marching = new GameEvent();
-
- private int marchCount;
- private int turnLength;
-
+
+ public GameEvent bop = new GameEvent();
+ public GameEvent noBop = new GameEvent();
+ public GameEvent marching = new GameEvent();
+
+ private int marchOtherCount;
+ private int marchPlayerCount;
+ private int turnLength;
+
public static MarchingOrders instance;
public enum DirectionFaceTurn
- {
+ {
Right,
Left,
}
public enum FaceTurnLength
- {
+ {
Normal,
Fast,
}
@@ -122,50 +123,50 @@ namespace HeavenStudio.Games
// Update is called once per frame
void Update()
{
- var cond = Conductor.instance;
+ var cond = Conductor.instance;
if (cond.ReportBeat(ref bop.lastReportedBeat, bop.startBeat % 1))
{
if (cond.songPositionInBeats >= bop.startBeat && cond.songPositionInBeats < bop.startBeat + bop.length)
{
if (!(cond.songPositionInBeats >= noBop.startBeat && cond.songPositionInBeats < noBop.startBeat + noBop.length))
Cadet1.DoScaledAnimationAsync("Bop", 0.5f);
- Cadet2.DoScaledAnimationAsync("Bop", 0.5f);
- Cadet3.DoScaledAnimationAsync("Bop", 0.5f);
- CadetPlayer.DoScaledAnimationAsync("Bop", 0.5f);
+ Cadet2.DoScaledAnimationAsync("Bop", 0.5f);
+ Cadet3.DoScaledAnimationAsync("Bop", 0.5f);
+ CadetPlayer.DoScaledAnimationAsync("Bop", 0.5f);
}
}
-
- if (cond.ReportBeat(ref marching.lastReportedBeat, bop.startBeat % 1))
+
+ if (cond.ReportBeat(ref marching.lastReportedBeat, bop.startBeat % 1))
{
if (cond.songPositionInBeats >= marching.startBeat && cond.songPositionInBeats < marching.startBeat + marching.length)
{
- marchCount += 1;
- var marchAnim = (marchCount % 2 != 0 ? "MarchR" : "MarchL");
+ marchOtherCount += 1;
+ var marchAnim = (marchOtherCount % 2 != 0 ? "MarchR" : "MarchL");
Jukebox.PlayOneShotGame("marchingOrders/step1");
- Cadet1.DoScaledAnimationAsync(marchAnim, 0.5f);
- Cadet2.DoScaledAnimationAsync(marchAnim, 0.5f);
- Cadet3.DoScaledAnimationAsync(marchAnim, 0.5f);
+ Cadet1.DoScaledAnimationAsync(marchAnim, 0.5f);
+ Cadet2.DoScaledAnimationAsync(marchAnim, 0.5f);
+ Cadet3.DoScaledAnimationAsync(marchAnim, 0.5f);
}
}
-
- if (PlayerInput.Pressed() && !IsExpectingInputNow())
+
+ if (PlayerInput.Pressed() && !IsExpectingInputNow())
{
Jukebox.PlayOneShot("miss");
Sarge.DoScaledAnimationAsync("Anger", 0.5f);
}
}
- public void Bop(float beat, float length)
+ public void Bop(float beat, float length)
{
bop.length = length;
bop.startBeat = beat;
}
-
+
public void CadetsMarch(float beat, float length)
{
marching.length = length;
- marching.startBeat = beat;
+ marching.startBeat = beat;
}
public void SargeAttention(float beat)
@@ -175,105 +176,107 @@ namespace HeavenStudio.Games
new MultiSound.Sound("marchingOrders/attention2", beat + 0.25f),
new MultiSound.Sound("marchingOrders/attention3", beat + 0.75f),
}, forcePlay:true);
-
- BeatAction.New(Player, new List()
+
+ BeatAction.New(Player, new List()
{
new BeatAction.Action(beat + 0.25f, delegate { Sarge.DoScaledAnimationAsync("Talk", 0.5f);}),
});
}
-
- public void SargeMarch(float beat)
+
+ public void SargeMarch(float beat)
{
- marchCount = 0;
-
- MultiSound.Play(new MultiSound.Sound[] {
+ marchOtherCount = 0;
+ marchPlayerCount = 0;
+
+ MultiSound.Play(new MultiSound.Sound[] {
new MultiSound.Sound("marchingOrders/march1", beat),
new MultiSound.Sound("marchingOrders/march2", beat + 1f),
}, forcePlay:true);
-
- BeatAction.New(Player, new List()
+
+ BeatAction.New(Player, new List()
{
new BeatAction.Action(beat, delegate { Sarge.DoScaledAnimationAsync("Talk", 0.5f);}),
- new BeatAction.Action(beat + 1f, delegate { Cadet1.DoScaledAnimationAsync("MarchL", 0.5f);}),
+ new BeatAction.Action(beat + 1f, delegate { Cadet1.DoScaledAnimationAsync("MarchL", 0.5f);}),
new BeatAction.Action(beat + 1f, delegate { Cadet2.DoScaledAnimationAsync("MarchL", 0.5f);}),
- new BeatAction.Action(beat + 1f, delegate { Cadet3.DoScaledAnimationAsync("MarchL", 0.5f);}),
- new BeatAction.Action(beat + 1f, delegate { CadetPlayer.DoScaledAnimationAsync("MarchL", 0.5f);}),
- });
+ new BeatAction.Action(beat + 1f, delegate { Cadet3.DoScaledAnimationAsync("MarchL", 0.5f);}),
+ new BeatAction.Action(beat + 1f, delegate { CadetPlayer.DoScaledAnimationAsync("MarchL", 0.5f);}),
+ });
}
- public void SargeHalt(float beat)
+ public void SargeHalt(float beat)
{
- MultiSound.Play(new MultiSound.Sound[] {
+ MultiSound.Play(new MultiSound.Sound[] {
new MultiSound.Sound("marchingOrders/halt1", beat),
new MultiSound.Sound("marchingOrders/halt2", beat + 1f),
- new MultiSound.Sound("marchingOrders/step1", beat + 1f),
+ new MultiSound.Sound("marchingOrders/step1", beat + 1f),
}, forcePlay:true);
-
- BeatAction.New(Player, new List()
+
+ BeatAction.New(Player, new List()
{
new BeatAction.Action(beat, delegate { Sarge.DoScaledAnimationAsync("Talk", 0.5f);}),
- new BeatAction.Action(beat + 1f, delegate { Cadet1.DoScaledAnimationAsync("Halt", 0.5f);}),
+ new BeatAction.Action(beat + 1f, delegate { Cadet1.DoScaledAnimationAsync("Halt", 0.5f);}),
new BeatAction.Action(beat + 1f, delegate { Cadet2.DoScaledAnimationAsync("Halt", 0.5f);}),
- new BeatAction.Action(beat + 1f, delegate { Cadet3.DoScaledAnimationAsync("Halt", 0.5f);}),
- });
+ new BeatAction.Action(beat + 1f, delegate { Cadet3.DoScaledAnimationAsync("Halt", 0.5f);}),
+ });
}
-
- public void SargeFaceTurn(float beat, int type, int type2)
+
+ public void SargeFaceTurn(float beat, int type, int type2)
{
- switch (type2)
- {
- case (int) MarchingOrders.FaceTurnLength.Fast:
- turnLength = 0;
- break;
- default:
- turnLength = 1;
- break;
+ switch (type2)
+ {
+ case (int) MarchingOrders.FaceTurnLength.Fast:
+ turnLength = 0;
+ break;
+ default:
+ turnLength = 1;
+ break;
}
-
-
- switch (type)
+
+
+ switch (type)
{
case (int) MarchingOrders.DirectionFaceTurn.Left:
- MultiSound.Play(new MultiSound.Sound[] {
- new MultiSound.Sound("marchingOrders/leftFaceTurn1", beat),
- new MultiSound.Sound("marchingOrders/leftFaceTurn2", beat + 0.5f),
- new MultiSound.Sound("marchingOrders/leftFaceTurn3", beat + turnLength + 1f),
- new MultiSound.Sound("marchingOrders/leftFaceTurn4", beat + turnLength + 2f),
- }, forcePlay:true);
-
- BeatAction.New(Player, new List()
- {
- new BeatAction.Action(beat + turnLength + 2f, delegate { CadetHead1.DoScaledAnimationAsync("FaceL", 0.5f);}),
- new BeatAction.Action(beat + turnLength + 2f, delegate { CadetHead2.DoScaledAnimationAsync("FaceL", 0.5f);}),
- new BeatAction.Action(beat + turnLength + 2f, delegate { CadetHead3.DoScaledAnimationAsync("FaceL", 0.5f);}),
- });
- break;
- default:
+ //ScheduleInput(beat, turnLength + 2f, InputType.DIRECTION_RIGHT_DOWN, LeftSuccess, LeftMiss, LeftEmpty);
MultiSound.Play(new MultiSound.Sound[] {
- new MultiSound.Sound("marchingOrders/rightFaceTurn1", beat),
- new MultiSound.Sound("marchingOrders/rightFaceTurn2", beat + 0.5f),
- new MultiSound.Sound("marchingOrders/rightFaceTurn3", beat + turnLength + 1f),
- new MultiSound.Sound("marchingOrders/rightFaceTurn4", beat + turnLength + 2f),
- }, forcePlay:true);
-
- BeatAction.New(Player, new List()
- {
- new BeatAction.Action(beat + turnLength + 2f, delegate { CadetHead1.DoScaledAnimationAsync("FaceR", 0.5f);}),
- new BeatAction.Action(beat + turnLength + 2f, delegate { CadetHead2.DoScaledAnimationAsync("FaceR", 0.5f);}),
- new BeatAction.Action(beat + turnLength + 2f, delegate { CadetHead3.DoScaledAnimationAsync("FaceR", 0.5f);}),
- });
+ new MultiSound.Sound("marchingOrders/leftFaceTurn1", beat),
+ new MultiSound.Sound("marchingOrders/leftFaceTurn2", beat + 0.5f),
+ new MultiSound.Sound("marchingOrders/leftFaceTurn3", beat + turnLength + 1f),
+ new MultiSound.Sound("marchingOrders/leftFaceTurn4", beat + turnLength + 2f),
+ }, forcePlay:true);
+
+ BeatAction.New(Player, new List()
+ {
+ new BeatAction.Action(beat + turnLength + 2f, delegate { CadetHead1.DoScaledAnimationAsync("FaceL", 0.5f);}),
+ new BeatAction.Action(beat + turnLength + 2f, delegate { CadetHead2.DoScaledAnimationAsync("FaceL", 0.5f);}),
+ new BeatAction.Action(beat + turnLength + 2f, delegate { CadetHead3.DoScaledAnimationAsync("FaceL", 0.5f);}),
+ });
break;
- }
-
- BeatAction.New(Player, new List()
- {
- new BeatAction.Action(beat, delegate { Sarge.DoScaledAnimationAsync("Talk", 0.5f);}),
- new BeatAction.Action(beat + turnLength + 1f, delegate { Sarge.DoScaledAnimationAsync("Talk", 0.5f);}),
- });
- }
-
-
- public static void AttentionSound(float beat)
+ default:
+ MultiSound.Play(new MultiSound.Sound[] {
+ new MultiSound.Sound("marchingOrders/rightFaceTurn1", beat),
+ new MultiSound.Sound("marchingOrders/rightFaceTurn2", beat + 0.5f),
+ new MultiSound.Sound("marchingOrders/rightFaceTurn3", beat + turnLength + 1f),
+ new MultiSound.Sound("marchingOrders/rightFaceTurn4", beat + turnLength + 2f),
+ }, forcePlay:true);
+
+ BeatAction.New(Player, new List()
+ {
+ new BeatAction.Action(beat + turnLength + 2f, delegate { CadetHead1.DoScaledAnimationAsync("FaceR", 0.5f);}),
+ new BeatAction.Action(beat + turnLength + 2f, delegate { CadetHead2.DoScaledAnimationAsync("FaceR", 0.5f);}),
+ new BeatAction.Action(beat + turnLength + 2f, delegate { CadetHead3.DoScaledAnimationAsync("FaceR", 0.5f);}),
+ });
+ break;
+ }
+
+ BeatAction.New(Player, new List()
+ {
+ new BeatAction.Action(beat, delegate { Sarge.DoScaledAnimationAsync("Talk", 0.5f);}),
+ new BeatAction.Action(beat + turnLength + 1f, delegate { Sarge.DoScaledAnimationAsync("Talk", 0.5f);}),
+ });
+ }
+
+
+ public static void AttentionSound(float beat)
{
MultiSound.Play(new MultiSound.Sound[] {
new MultiSound.Sound("marchingOrders/attention1", beat),
@@ -281,16 +284,16 @@ namespace HeavenStudio.Games
new MultiSound.Sound("marchingOrders/attention3", beat + 0.75f),
}, forcePlay:true);
}
-
- public static void MarchSound(float beat)
+
+ public static void MarchSound(float beat)
{
MultiSound.Play(new MultiSound.Sound[] {
new MultiSound.Sound("marchingOrders/march1", beat),
new MultiSound.Sound("marchingOrders/march2", beat + 1f),
}, forcePlay:true);
}
-
- public static void HaltSound(float beat)
+
+ public static void HaltSound(float beat)
{
MultiSound.Play(new MultiSound.Sound[] {
new MultiSound.Sound("marchingOrders/halt1", beat),
diff --git a/Assets/StreamingAssets/ntrcoin/common b/Assets/StreamingAssets/ntrcoin/common
index 29da14c77..3baecb5db 100644
Binary files a/Assets/StreamingAssets/ntrcoin/common and b/Assets/StreamingAssets/ntrcoin/common differ
diff --git a/Assets/StreamingAssets/ntrcoin/common.manifest b/Assets/StreamingAssets/ntrcoin/common.manifest
index 1f7759b0b..c642f5191 100644
--- a/Assets/StreamingAssets/ntrcoin/common.manifest
+++ b/Assets/StreamingAssets/ntrcoin/common.manifest
@@ -1,9 +1,9 @@
ManifestFileVersion: 0
-CRC: 2049244877
+CRC: 3145129048
Hashes:
AssetFileHash:
serializedVersion: 2
- Hash: 1e93b5f219a06063ba1cdb3ac24c80fe
+ Hash: accf70966bae19a4dbcad02679a20b19
TypeTreeHash:
serializedVersion: 2
Hash: 1341d321cd8444a4f78a51a8a0c6daff
@@ -40,13 +40,10 @@ Assets:
- Assets/Resources/Sprites/Games/CoinToss/Animations/Catch_success.anim
- Assets/Resources/Sfx/games/coinToss/women_you.wav
- Assets/Resources/Sprites/Games/CoinToss/Animations/Throw.anim
-- Assets/Resources/Sfx/games/coinToss/miss.wav
- Assets/Resources/Sprites/Games/CoinToss/Animations/Idle.anim
- Assets/Resources/Games/coinToss.prefab
-- Assets/Resources/Sfx/games/coinToss/applause.ogg
- Assets/Resources/Sfx/games/coinToss/throw.wav
- Assets/Resources/Sprites/Games/CoinToss/Animations/Pickup.anim
-- Assets/Resources/Sfx/games/coinToss/disappointed.ogg
- Assets/Resources/Sfx/games/coinToss/catch.wav
- Assets/Resources/Sprites/Games/CoinToss/Animations/Catch_empty.anim
- Assets/Resources/Sprites/Games/CoinToss/sprsh_cointoss.png