diff --git a/Assets/Resources/Games/slotMonster.prefab b/Assets/Resources/Games/slotMonster.prefab index c2111061d..0085c6c6f 100644 --- a/Assets/Resources/Games/slotMonster.prefab +++ b/Assets/Resources/Games/slotMonster.prefab @@ -1502,10 +1502,25 @@ MonoBehaviour: SoundSequences: [] scheduledInputs: [] smAnim: {fileID: 8395666848120559718} + eyeSprites: + - {fileID: 1032231447, guid: 878a62db1eeb38d46a0db8e2b67b9730, type: 3} + - {fileID: 90921217, guid: 878a62db1eeb38d46a0db8e2b67b9730, type: 3} + - {fileID: -108380036, guid: 878a62db1eeb38d46a0db8e2b67b9730, type: 3} + - {fileID: -1768230940, guid: 878a62db1eeb38d46a0db8e2b67b9730, type: 3} + - {fileID: -867298969, guid: 878a62db1eeb38d46a0db8e2b67b9730, type: 3} + - {fileID: 1609057261, guid: 878a62db1eeb38d46a0db8e2b67b9730, type: 3} + - {fileID: -1628350790, guid: 878a62db1eeb38d46a0db8e2b67b9730, type: 3} + - {fileID: 1306426365, guid: 878a62db1eeb38d46a0db8e2b67b9730, type: 3} + - {fileID: 811989312, guid: 878a62db1eeb38d46a0db8e2b67b9730, type: 3} + - {fileID: -1260976779, guid: 878a62db1eeb38d46a0db8e2b67b9730, type: 3} eyeAnims: - {fileID: 7955005190241873031} - {fileID: 2460964828755838947} - {fileID: 5491330272697201237} + eyeSRs: + - {fileID: 2787758216707421360} + - {fileID: 1775810850113365420} + - {fileID: 8454085075965419430} buttonAnims: - {fileID: 8588887349593004598} - {fileID: 8656164449290761354} diff --git a/Assets/Resources/Sfx/games/slotMonster/stop_3_hit.wav b/Assets/Resources/Sfx/games/slotMonster/stop_hit.wav similarity index 100% rename from Assets/Resources/Sfx/games/slotMonster/stop_3_hit.wav rename to Assets/Resources/Sfx/games/slotMonster/stop_hit.wav diff --git a/Assets/Resources/Sfx/games/slotMonster/stop_3_hit.wav.meta b/Assets/Resources/Sfx/games/slotMonster/stop_hit.wav.meta similarity index 91% rename from Assets/Resources/Sfx/games/slotMonster/stop_3_hit.wav.meta rename to Assets/Resources/Sfx/games/slotMonster/stop_hit.wav.meta index 9b8737fa9..85d7fd965 100644 --- a/Assets/Resources/Sfx/games/slotMonster/stop_3_hit.wav.meta +++ b/Assets/Resources/Sfx/games/slotMonster/stop_hit.wav.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 49642b6d7cc6cbe4daa3a1f7f01fd6cb +guid: 576ac8ededbe3c2448d43d05e81b58cd AudioImporter: externalObjects: {} serializedVersion: 6 diff --git a/Assets/Resources/Sprites/Editor/GameIcons/slotMonster.png.meta b/Assets/Resources/Sprites/Editor/GameIcons/slotMonster.png.meta index b69c16f45..5835ba5e0 100644 --- a/Assets/Resources/Sprites/Editor/GameIcons/slotMonster.png.meta +++ b/Assets/Resources/Sprites/Editor/GameIcons/slotMonster.png.meta @@ -5,8 +5,8 @@ TextureImporter: externalObjects: {} serializedVersion: 12 mipmaps: - mipMapMode: 0 - enableMipMap: 0 + mipMapMode: 1 + enableMipMap: 1 sRGBTexture: 1 linearTexture: 0 fadeOut: 0 @@ -34,7 +34,7 @@ TextureImporter: textureSettings: serializedVersion: 2 filterMode: 1 - aniso: 1 + aniso: 8 mipBias: 0 wrapU: 1 wrapV: 1 @@ -67,10 +67,10 @@ TextureImporter: platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 + maxTextureSize: 256 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 1 + textureCompression: 0 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 diff --git a/Assets/Resources/Sprites/Editor/GameIcons/slotMonster_mask.png.meta b/Assets/Resources/Sprites/Editor/GameIcons/slotMonster_mask.png.meta index d1de3939d..f8d58465b 100644 --- a/Assets/Resources/Sprites/Editor/GameIcons/slotMonster_mask.png.meta +++ b/Assets/Resources/Sprites/Editor/GameIcons/slotMonster_mask.png.meta @@ -5,8 +5,8 @@ TextureImporter: externalObjects: {} serializedVersion: 12 mipmaps: - mipMapMode: 0 - enableMipMap: 0 + mipMapMode: 1 + enableMipMap: 1 sRGBTexture: 1 linearTexture: 0 fadeOut: 0 @@ -34,7 +34,7 @@ TextureImporter: textureSettings: serializedVersion: 2 filterMode: 1 - aniso: 1 + aniso: 8 mipBias: 0 wrapU: 1 wrapV: 1 @@ -67,10 +67,10 @@ TextureImporter: platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 + maxTextureSize: 256 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 1 + textureCompression: 0 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 diff --git a/Assets/Resources/Sprites/Games/SlotMonster/Animations/Button/Flash.anim b/Assets/Resources/Sprites/Games/SlotMonster/Animations/Button/Flash.anim index 6853dbc9d..78b619f88 100644 --- a/Assets/Resources/Sprites/Games/SlotMonster/Animations/Button/Flash.anim +++ b/Assets/Resources/Sprites/Games/SlotMonster/Animations/Button/Flash.anim @@ -14,34 +14,121 @@ AnimationClip: m_RotationCurves: [] m_CompressedRotationCurves: [] m_EulerCurves: [] - m_PositionCurves: + m_PositionCurves: [] + m_ScaleCurves: [] + m_FloatCurves: - curve: serializedVersion: 2 m_Curve: - serializedVersion: 3 time: 0 - value: {x: -0.02, y: -0.01, z: 0} - inSlope: {x: 0, y: 0, z: 0} - outSlope: {x: 0, y: 0, z: 0} - tangentMode: 0 + value: 1 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 weightedMode: 0 - inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + inWeight: 0 + outWeight: 0 - serializedVersion: 3 - time: 0.083333336 - value: {x: 0.179, y: 0.2550001, z: 0} - inSlope: {x: 0, y: 0, z: 0} - outSlope: {x: 0, y: 0, z: 0} - tangentMode: 0 + time: 0.05 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 weightedMode: 0 - inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + inWeight: 0 + outWeight: 0 m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 - path: Button/ButtonSheen - m_ScaleCurves: [] - m_FloatCurves: [] + attribute: m_IsActive + path: FlashButton + classID: 1 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.05 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_Color.a + path: FlashButton/ButtonBottom + classID: 212 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.05 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_Color.a + path: FlashButton/Button + classID: 212 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.05 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_Color.a + path: FlashButton/Button/ButtonSheen + classID: 212 + script: {fileID: 0} m_PPtrCurves: [] m_SampleRate: 60 m_WrapMode: 0 @@ -51,10 +138,31 @@ AnimationClip: m_ClipBindingConstant: genericBindings: - serializedVersion: 2 - path: 2725912158 - attribute: 1 + path: 3277295360 + attribute: 2086281974 script: {fileID: 0} - typeID: 4 + typeID: 1 + customType: 0 + isPPtrCurve: 0 + - serializedVersion: 2 + path: 2811717293 + attribute: 304273561 + script: {fileID: 0} + typeID: 212 + customType: 0 + isPPtrCurve: 0 + - serializedVersion: 2 + path: 702311069 + attribute: 304273561 + script: {fileID: 0} + typeID: 212 + customType: 0 + isPPtrCurve: 0 + - serializedVersion: 2 + path: 329815409 + attribute: 304273561 + script: {fileID: 0} + typeID: 212 customType: 0 isPPtrCurve: 0 pptrCurveMapping: [] @@ -63,7 +171,7 @@ AnimationClip: m_AdditiveReferencePoseClip: {fileID: 0} m_AdditiveReferencePoseTime: 0 m_StartTime: 0 - m_StopTime: 0.083333336 + m_StopTime: 0.05 m_OrientationOffsetY: 0 m_Level: 0 m_CycleOffset: 0 @@ -84,63 +192,35 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: -0.02 - inSlope: 0 - outSlope: 0 - tangentMode: 136 + value: 1 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 + inWeight: 0 + outWeight: 0 - serializedVersion: 3 - time: 0.083333336 - value: 0.179 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: m_LocalPosition.x - path: Button/ButtonSheen - classID: 4 - script: {fileID: 0} - - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: -0.01 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.083333336 - value: 0.2550001 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: m_LocalPosition.y - path: Button/ButtonSheen - classID: 4 - script: {fileID: 0} - - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 + time: 0.05 value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_IsActive + path: FlashButton + classID: 1 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -148,7 +228,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.083333336 + time: 0.05 value: 0 inSlope: 0 outSlope: 0 @@ -159,9 +239,65 @@ AnimationClip: m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 - attribute: m_LocalPosition.z - path: Button/ButtonSheen - classID: 4 + attribute: m_Color.a + path: FlashButton/ButtonBottom + classID: 212 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.05 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_Color.a + path: FlashButton/Button + classID: 212 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.05 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_Color.a + path: FlashButton/Button/ButtonSheen + classID: 212 script: {fileID: 0} m_EulerEditorCurves: [] m_HasGenericRootTransform: 0 diff --git a/Assets/Resources/Sprites/Games/SlotMonster/Animations/Button/Press.anim b/Assets/Resources/Sprites/Games/SlotMonster/Animations/Button/Press.anim index eb11dd1a3..3d148bf74 100644 --- a/Assets/Resources/Sprites/Games/SlotMonster/Animations/Button/Press.anim +++ b/Assets/Resources/Sprites/Games/SlotMonster/Animations/Button/Press.anim @@ -19,7 +19,7 @@ AnimationClip: serializedVersion: 2 m_Curve: - serializedVersion: 3 - time: 0 + time: 0.16666667 value: {x: 0, y: 0.319, z: 0} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} @@ -36,7 +36,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: {x: 0, y: 0.711, z: 0} + value: {x: 0, y: 0.61, z: 0} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 @@ -44,8 +44,8 @@ AnimationClip: inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 - time: 0.016666668 - value: {x: 0, y: 0.61, z: 0} + time: 0.16666667 + value: {x: 0, y: 0.711, z: 0} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 @@ -101,7 +101,7 @@ AnimationClip: m_AdditiveReferencePoseClip: {fileID: 0} m_AdditiveReferencePoseTime: 0 m_StartTime: 0 - m_StopTime: 0.016666668 + m_StopTime: 0.16666667 m_OrientationOffsetY: 0 m_Level: 0 m_CycleOffset: 0 @@ -121,7 +121,7 @@ AnimationClip: serializedVersion: 2 m_Curve: - serializedVersion: 3 - time: 0 + time: 0.16666667 value: 0 inSlope: 0 outSlope: 0 @@ -140,7 +140,7 @@ AnimationClip: serializedVersion: 2 m_Curve: - serializedVersion: 3 - time: 0 + time: 0.16666667 value: 0.319 inSlope: 0 outSlope: 0 @@ -159,7 +159,7 @@ AnimationClip: serializedVersion: 2 m_Curve: - serializedVersion: 3 - time: 0 + time: 0.16666667 value: 0 inSlope: 0 outSlope: 0 @@ -187,7 +187,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.016666668 + time: 0.16666667 value: 0 inSlope: 0 outSlope: 0 @@ -207,7 +207,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: 0.711 + value: 0.61 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -215,8 +215,8 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.016666668 - value: 0.61 + time: 0.16666667 + value: 0.711 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -243,7 +243,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.016666668 + time: 0.16666667 value: 0 inSlope: 0 outSlope: 0 diff --git a/Assets/Resources/Sprites/Games/SlotMonster/Animations/SlotMonster/Eyes/EyeItem1.anim b/Assets/Resources/Sprites/Games/SlotMonster/Animations/SlotMonster/Eyes/EyeItem1.anim new file mode 100644 index 000000000..62373ef2d --- /dev/null +++ b/Assets/Resources/Sprites/Games/SlotMonster/Animations/SlotMonster/Eyes/EyeItem1.anim @@ -0,0 +1,68 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!74 &7400000 +AnimationClip: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: EyeItem1 + serializedVersion: 6 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: [] + m_ScaleCurves: [] + m_FloatCurves: [] + m_PPtrCurves: + - curve: + - time: 0 + value: {fileID: 1032231447, guid: 878a62db1eeb38d46a0db8e2b67b9730, type: 3} + attribute: m_Sprite + path: + classID: 212 + script: {fileID: 0} + m_SampleRate: 60 + m_WrapMode: 0 + m_Bounds: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + m_ClipBindingConstant: + genericBindings: + - serializedVersion: 2 + path: 0 + attribute: 0 + script: {fileID: 0} + typeID: 212 + customType: 23 + isPPtrCurve: 1 + pptrCurveMapping: + - {fileID: 1032231447, guid: 878a62db1eeb38d46a0db8e2b67b9730, type: 3} + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 0.016666668 + m_OrientationOffsetY: 0 + m_Level: 0 + m_CycleOffset: 0 + m_HasAdditiveReferencePose: 0 + m_LoopTime: 1 + m_LoopBlend: 0 + m_LoopBlendOrientation: 0 + m_LoopBlendPositionY: 0 + m_LoopBlendPositionXZ: 0 + m_KeepOriginalOrientation: 0 + m_KeepOriginalPositionY: 1 + m_KeepOriginalPositionXZ: 0 + m_HeightFromFeet: 0 + m_Mirror: 0 + m_EditorCurves: [] + m_EulerEditorCurves: [] + m_HasGenericRootTransform: 0 + m_HasMotionFloatCurves: 0 + m_Events: [] diff --git a/Assets/Resources/Sprites/Games/SlotMonster/Animations/SlotMonster/Eyes/EyeItem1.anim.meta b/Assets/Resources/Sprites/Games/SlotMonster/Animations/SlotMonster/Eyes/EyeItem1.anim.meta new file mode 100644 index 000000000..a06b78955 --- /dev/null +++ b/Assets/Resources/Sprites/Games/SlotMonster/Animations/SlotMonster/Eyes/EyeItem1.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 52fd2687cf282bf4c968e3c55a1a6782 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sprites/Games/SlotMonster/Animations/SlotMonster/Eyes/EyeItem10.anim b/Assets/Resources/Sprites/Games/SlotMonster/Animations/SlotMonster/Eyes/EyeItem10.anim new file mode 100644 index 000000000..b630f59ab --- /dev/null +++ b/Assets/Resources/Sprites/Games/SlotMonster/Animations/SlotMonster/Eyes/EyeItem10.anim @@ -0,0 +1,68 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!74 &7400000 +AnimationClip: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: EyeItem10 + serializedVersion: 6 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: [] + m_ScaleCurves: [] + m_FloatCurves: [] + m_PPtrCurves: + - curve: + - time: 0 + value: {fileID: -1260976779, guid: 878a62db1eeb38d46a0db8e2b67b9730, type: 3} + attribute: m_Sprite + path: + classID: 212 + script: {fileID: 0} + m_SampleRate: 60 + m_WrapMode: 0 + m_Bounds: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + m_ClipBindingConstant: + genericBindings: + - serializedVersion: 2 + path: 0 + attribute: 0 + script: {fileID: 0} + typeID: 212 + customType: 23 + isPPtrCurve: 1 + pptrCurveMapping: + - {fileID: -1260976779, guid: 878a62db1eeb38d46a0db8e2b67b9730, type: 3} + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 0.016666668 + m_OrientationOffsetY: 0 + m_Level: 0 + m_CycleOffset: 0 + m_HasAdditiveReferencePose: 0 + m_LoopTime: 1 + m_LoopBlend: 0 + m_LoopBlendOrientation: 0 + m_LoopBlendPositionY: 0 + m_LoopBlendPositionXZ: 0 + m_KeepOriginalOrientation: 0 + m_KeepOriginalPositionY: 1 + m_KeepOriginalPositionXZ: 0 + m_HeightFromFeet: 0 + m_Mirror: 0 + m_EditorCurves: [] + m_EulerEditorCurves: [] + m_HasGenericRootTransform: 0 + m_HasMotionFloatCurves: 0 + m_Events: [] diff --git a/Assets/Resources/Sprites/Games/SlotMonster/Animations/SlotMonster/Eyes/EyeItem10.anim.meta b/Assets/Resources/Sprites/Games/SlotMonster/Animations/SlotMonster/Eyes/EyeItem10.anim.meta new file mode 100644 index 000000000..592453777 --- /dev/null +++ b/Assets/Resources/Sprites/Games/SlotMonster/Animations/SlotMonster/Eyes/EyeItem10.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 1b9fff39f1df4754a98fc517dd23d63d +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sprites/Games/SlotMonster/Animations/SlotMonster/Eyes/EyeItem2.anim b/Assets/Resources/Sprites/Games/SlotMonster/Animations/SlotMonster/Eyes/EyeItem2.anim new file mode 100644 index 000000000..b1ed44ad1 --- /dev/null +++ b/Assets/Resources/Sprites/Games/SlotMonster/Animations/SlotMonster/Eyes/EyeItem2.anim @@ -0,0 +1,68 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!74 &7400000 +AnimationClip: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: EyeItem2 + serializedVersion: 6 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: [] + m_ScaleCurves: [] + m_FloatCurves: [] + m_PPtrCurves: + - curve: + - time: 0 + value: {fileID: 90921217, guid: 878a62db1eeb38d46a0db8e2b67b9730, type: 3} + attribute: m_Sprite + path: + classID: 212 + script: {fileID: 0} + m_SampleRate: 60 + m_WrapMode: 0 + m_Bounds: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + m_ClipBindingConstant: + genericBindings: + - serializedVersion: 2 + path: 0 + attribute: 0 + script: {fileID: 0} + typeID: 212 + customType: 23 + isPPtrCurve: 1 + pptrCurveMapping: + - {fileID: 90921217, guid: 878a62db1eeb38d46a0db8e2b67b9730, type: 3} + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 0.016666668 + m_OrientationOffsetY: 0 + m_Level: 0 + m_CycleOffset: 0 + m_HasAdditiveReferencePose: 0 + m_LoopTime: 1 + m_LoopBlend: 0 + m_LoopBlendOrientation: 0 + m_LoopBlendPositionY: 0 + m_LoopBlendPositionXZ: 0 + m_KeepOriginalOrientation: 0 + m_KeepOriginalPositionY: 1 + m_KeepOriginalPositionXZ: 0 + m_HeightFromFeet: 0 + m_Mirror: 0 + m_EditorCurves: [] + m_EulerEditorCurves: [] + m_HasGenericRootTransform: 0 + m_HasMotionFloatCurves: 0 + m_Events: [] diff --git a/Assets/Resources/Sprites/Games/SlotMonster/Animations/SlotMonster/Eyes/EyeItem2.anim.meta b/Assets/Resources/Sprites/Games/SlotMonster/Animations/SlotMonster/Eyes/EyeItem2.anim.meta new file mode 100644 index 000000000..64f269ff8 --- /dev/null +++ b/Assets/Resources/Sprites/Games/SlotMonster/Animations/SlotMonster/Eyes/EyeItem2.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: dc7a7d5383b19834c8aabcdf8a5f27c4 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sprites/Games/SlotMonster/Animations/SlotMonster/Eyes/EyeItem3.anim b/Assets/Resources/Sprites/Games/SlotMonster/Animations/SlotMonster/Eyes/EyeItem3.anim new file mode 100644 index 000000000..e7f6790d5 --- /dev/null +++ b/Assets/Resources/Sprites/Games/SlotMonster/Animations/SlotMonster/Eyes/EyeItem3.anim @@ -0,0 +1,68 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!74 &7400000 +AnimationClip: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: EyeItem3 + serializedVersion: 6 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: [] + m_ScaleCurves: [] + m_FloatCurves: [] + m_PPtrCurves: + - curve: + - time: 0 + value: {fileID: -108380036, guid: 878a62db1eeb38d46a0db8e2b67b9730, type: 3} + attribute: m_Sprite + path: + classID: 212 + script: {fileID: 0} + m_SampleRate: 60 + m_WrapMode: 0 + m_Bounds: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + m_ClipBindingConstant: + genericBindings: + - serializedVersion: 2 + path: 0 + attribute: 0 + script: {fileID: 0} + typeID: 212 + customType: 23 + isPPtrCurve: 1 + pptrCurveMapping: + - {fileID: -108380036, guid: 878a62db1eeb38d46a0db8e2b67b9730, type: 3} + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 0.016666668 + m_OrientationOffsetY: 0 + m_Level: 0 + m_CycleOffset: 0 + m_HasAdditiveReferencePose: 0 + m_LoopTime: 1 + m_LoopBlend: 0 + m_LoopBlendOrientation: 0 + m_LoopBlendPositionY: 0 + m_LoopBlendPositionXZ: 0 + m_KeepOriginalOrientation: 0 + m_KeepOriginalPositionY: 1 + m_KeepOriginalPositionXZ: 0 + m_HeightFromFeet: 0 + m_Mirror: 0 + m_EditorCurves: [] + m_EulerEditorCurves: [] + m_HasGenericRootTransform: 0 + m_HasMotionFloatCurves: 0 + m_Events: [] diff --git a/Assets/Resources/Sprites/Games/SlotMonster/Animations/SlotMonster/Eyes/EyeItem3.anim.meta b/Assets/Resources/Sprites/Games/SlotMonster/Animations/SlotMonster/Eyes/EyeItem3.anim.meta new file mode 100644 index 000000000..12a2ad7a7 --- /dev/null +++ b/Assets/Resources/Sprites/Games/SlotMonster/Animations/SlotMonster/Eyes/EyeItem3.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: da95235c1fa31d646976372843395182 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sprites/Games/SlotMonster/Animations/SlotMonster/Eyes/EyeItem4.anim b/Assets/Resources/Sprites/Games/SlotMonster/Animations/SlotMonster/Eyes/EyeItem4.anim new file mode 100644 index 000000000..ebbd98a48 --- /dev/null +++ b/Assets/Resources/Sprites/Games/SlotMonster/Animations/SlotMonster/Eyes/EyeItem4.anim @@ -0,0 +1,68 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!74 &7400000 +AnimationClip: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: EyeItem4 + serializedVersion: 6 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: [] + m_ScaleCurves: [] + m_FloatCurves: [] + m_PPtrCurves: + - curve: + - time: 0 + value: {fileID: -1768230940, guid: 878a62db1eeb38d46a0db8e2b67b9730, type: 3} + attribute: m_Sprite + path: + classID: 212 + script: {fileID: 0} + m_SampleRate: 60 + m_WrapMode: 0 + m_Bounds: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + m_ClipBindingConstant: + genericBindings: + - serializedVersion: 2 + path: 0 + attribute: 0 + script: {fileID: 0} + typeID: 212 + customType: 23 + isPPtrCurve: 1 + pptrCurveMapping: + - {fileID: -1768230940, guid: 878a62db1eeb38d46a0db8e2b67b9730, type: 3} + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 0.016666668 + m_OrientationOffsetY: 0 + m_Level: 0 + m_CycleOffset: 0 + m_HasAdditiveReferencePose: 0 + m_LoopTime: 1 + m_LoopBlend: 0 + m_LoopBlendOrientation: 0 + m_LoopBlendPositionY: 0 + m_LoopBlendPositionXZ: 0 + m_KeepOriginalOrientation: 0 + m_KeepOriginalPositionY: 1 + m_KeepOriginalPositionXZ: 0 + m_HeightFromFeet: 0 + m_Mirror: 0 + m_EditorCurves: [] + m_EulerEditorCurves: [] + m_HasGenericRootTransform: 0 + m_HasMotionFloatCurves: 0 + m_Events: [] diff --git a/Assets/Resources/Sprites/Games/SlotMonster/Animations/SlotMonster/Eyes/EyeItem4.anim.meta b/Assets/Resources/Sprites/Games/SlotMonster/Animations/SlotMonster/Eyes/EyeItem4.anim.meta new file mode 100644 index 000000000..a2a350d01 --- /dev/null +++ b/Assets/Resources/Sprites/Games/SlotMonster/Animations/SlotMonster/Eyes/EyeItem4.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 6de11b9c83f4f08479efd163724b8ca5 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sprites/Games/SlotMonster/Animations/SlotMonster/Eyes/EyeItem5.anim b/Assets/Resources/Sprites/Games/SlotMonster/Animations/SlotMonster/Eyes/EyeItem5.anim new file mode 100644 index 000000000..b710ba65f --- /dev/null +++ b/Assets/Resources/Sprites/Games/SlotMonster/Animations/SlotMonster/Eyes/EyeItem5.anim @@ -0,0 +1,68 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!74 &7400000 +AnimationClip: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: EyeItem5 + serializedVersion: 6 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: [] + m_ScaleCurves: [] + m_FloatCurves: [] + m_PPtrCurves: + - curve: + - time: 0 + value: {fileID: -867298969, guid: 878a62db1eeb38d46a0db8e2b67b9730, type: 3} + attribute: m_Sprite + path: + classID: 212 + script: {fileID: 0} + m_SampleRate: 60 + m_WrapMode: 0 + m_Bounds: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + m_ClipBindingConstant: + genericBindings: + - serializedVersion: 2 + path: 0 + attribute: 0 + script: {fileID: 0} + typeID: 212 + customType: 23 + isPPtrCurve: 1 + pptrCurveMapping: + - {fileID: -867298969, guid: 878a62db1eeb38d46a0db8e2b67b9730, type: 3} + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 0.016666668 + m_OrientationOffsetY: 0 + m_Level: 0 + m_CycleOffset: 0 + m_HasAdditiveReferencePose: 0 + m_LoopTime: 1 + m_LoopBlend: 0 + m_LoopBlendOrientation: 0 + m_LoopBlendPositionY: 0 + m_LoopBlendPositionXZ: 0 + m_KeepOriginalOrientation: 0 + m_KeepOriginalPositionY: 1 + m_KeepOriginalPositionXZ: 0 + m_HeightFromFeet: 0 + m_Mirror: 0 + m_EditorCurves: [] + m_EulerEditorCurves: [] + m_HasGenericRootTransform: 0 + m_HasMotionFloatCurves: 0 + m_Events: [] diff --git a/Assets/Resources/Sprites/Games/SlotMonster/Animations/SlotMonster/Eyes/EyeItem5.anim.meta b/Assets/Resources/Sprites/Games/SlotMonster/Animations/SlotMonster/Eyes/EyeItem5.anim.meta new file mode 100644 index 000000000..901a3430a --- /dev/null +++ b/Assets/Resources/Sprites/Games/SlotMonster/Animations/SlotMonster/Eyes/EyeItem5.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 6e1ba96447514e647aba73e15c315965 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sprites/Games/SlotMonster/Animations/SlotMonster/Eyes/EyeItem6.anim b/Assets/Resources/Sprites/Games/SlotMonster/Animations/SlotMonster/Eyes/EyeItem6.anim new file mode 100644 index 000000000..5c5bcb641 --- /dev/null +++ b/Assets/Resources/Sprites/Games/SlotMonster/Animations/SlotMonster/Eyes/EyeItem6.anim @@ -0,0 +1,68 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!74 &7400000 +AnimationClip: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: EyeItem6 + serializedVersion: 6 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: [] + m_ScaleCurves: [] + m_FloatCurves: [] + m_PPtrCurves: + - curve: + - time: 0 + value: {fileID: 1609057261, guid: 878a62db1eeb38d46a0db8e2b67b9730, type: 3} + attribute: m_Sprite + path: + classID: 212 + script: {fileID: 0} + m_SampleRate: 60 + m_WrapMode: 0 + m_Bounds: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + m_ClipBindingConstant: + genericBindings: + - serializedVersion: 2 + path: 0 + attribute: 0 + script: {fileID: 0} + typeID: 212 + customType: 23 + isPPtrCurve: 1 + pptrCurveMapping: + - {fileID: 1609057261, guid: 878a62db1eeb38d46a0db8e2b67b9730, type: 3} + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 0.016666668 + m_OrientationOffsetY: 0 + m_Level: 0 + m_CycleOffset: 0 + m_HasAdditiveReferencePose: 0 + m_LoopTime: 1 + m_LoopBlend: 0 + m_LoopBlendOrientation: 0 + m_LoopBlendPositionY: 0 + m_LoopBlendPositionXZ: 0 + m_KeepOriginalOrientation: 0 + m_KeepOriginalPositionY: 1 + m_KeepOriginalPositionXZ: 0 + m_HeightFromFeet: 0 + m_Mirror: 0 + m_EditorCurves: [] + m_EulerEditorCurves: [] + m_HasGenericRootTransform: 0 + m_HasMotionFloatCurves: 0 + m_Events: [] diff --git a/Assets/Resources/Sprites/Games/SlotMonster/Animations/SlotMonster/Eyes/EyeItem6.anim.meta b/Assets/Resources/Sprites/Games/SlotMonster/Animations/SlotMonster/Eyes/EyeItem6.anim.meta new file mode 100644 index 000000000..864f18ffe --- /dev/null +++ b/Assets/Resources/Sprites/Games/SlotMonster/Animations/SlotMonster/Eyes/EyeItem6.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 7751e3f6226e5f542aae16261016dc5c +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sprites/Games/SlotMonster/Animations/SlotMonster/Eyes/EyeItem7.anim b/Assets/Resources/Sprites/Games/SlotMonster/Animations/SlotMonster/Eyes/EyeItem7.anim new file mode 100644 index 000000000..3294544fb --- /dev/null +++ b/Assets/Resources/Sprites/Games/SlotMonster/Animations/SlotMonster/Eyes/EyeItem7.anim @@ -0,0 +1,68 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!74 &7400000 +AnimationClip: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: EyeItem7 + serializedVersion: 6 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: [] + m_ScaleCurves: [] + m_FloatCurves: [] + m_PPtrCurves: + - curve: + - time: 0 + value: {fileID: -1628350790, guid: 878a62db1eeb38d46a0db8e2b67b9730, type: 3} + attribute: m_Sprite + path: + classID: 212 + script: {fileID: 0} + m_SampleRate: 60 + m_WrapMode: 0 + m_Bounds: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + m_ClipBindingConstant: + genericBindings: + - serializedVersion: 2 + path: 0 + attribute: 0 + script: {fileID: 0} + typeID: 212 + customType: 23 + isPPtrCurve: 1 + pptrCurveMapping: + - {fileID: -1628350790, guid: 878a62db1eeb38d46a0db8e2b67b9730, type: 3} + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 0.016666668 + m_OrientationOffsetY: 0 + m_Level: 0 + m_CycleOffset: 0 + m_HasAdditiveReferencePose: 0 + m_LoopTime: 1 + m_LoopBlend: 0 + m_LoopBlendOrientation: 0 + m_LoopBlendPositionY: 0 + m_LoopBlendPositionXZ: 0 + m_KeepOriginalOrientation: 0 + m_KeepOriginalPositionY: 1 + m_KeepOriginalPositionXZ: 0 + m_HeightFromFeet: 0 + m_Mirror: 0 + m_EditorCurves: [] + m_EulerEditorCurves: [] + m_HasGenericRootTransform: 0 + m_HasMotionFloatCurves: 0 + m_Events: [] diff --git a/Assets/Resources/Sprites/Games/SlotMonster/Animations/SlotMonster/Eyes/EyeItem7.anim.meta b/Assets/Resources/Sprites/Games/SlotMonster/Animations/SlotMonster/Eyes/EyeItem7.anim.meta new file mode 100644 index 000000000..b7ef6e594 --- /dev/null +++ b/Assets/Resources/Sprites/Games/SlotMonster/Animations/SlotMonster/Eyes/EyeItem7.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: ffa035d8da30ebe43aa56e939b8ce32b +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sprites/Games/SlotMonster/Animations/SlotMonster/Eyes/EyeItem8.anim b/Assets/Resources/Sprites/Games/SlotMonster/Animations/SlotMonster/Eyes/EyeItem8.anim new file mode 100644 index 000000000..13500c9f9 --- /dev/null +++ b/Assets/Resources/Sprites/Games/SlotMonster/Animations/SlotMonster/Eyes/EyeItem8.anim @@ -0,0 +1,68 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!74 &7400000 +AnimationClip: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: EyeItem8 + serializedVersion: 6 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: [] + m_ScaleCurves: [] + m_FloatCurves: [] + m_PPtrCurves: + - curve: + - time: 0 + value: {fileID: 1306426365, guid: 878a62db1eeb38d46a0db8e2b67b9730, type: 3} + attribute: m_Sprite + path: + classID: 212 + script: {fileID: 0} + m_SampleRate: 60 + m_WrapMode: 0 + m_Bounds: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + m_ClipBindingConstant: + genericBindings: + - serializedVersion: 2 + path: 0 + attribute: 0 + script: {fileID: 0} + typeID: 212 + customType: 23 + isPPtrCurve: 1 + pptrCurveMapping: + - {fileID: 1306426365, guid: 878a62db1eeb38d46a0db8e2b67b9730, type: 3} + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 0.016666668 + m_OrientationOffsetY: 0 + m_Level: 0 + m_CycleOffset: 0 + m_HasAdditiveReferencePose: 0 + m_LoopTime: 1 + m_LoopBlend: 0 + m_LoopBlendOrientation: 0 + m_LoopBlendPositionY: 0 + m_LoopBlendPositionXZ: 0 + m_KeepOriginalOrientation: 0 + m_KeepOriginalPositionY: 1 + m_KeepOriginalPositionXZ: 0 + m_HeightFromFeet: 0 + m_Mirror: 0 + m_EditorCurves: [] + m_EulerEditorCurves: [] + m_HasGenericRootTransform: 0 + m_HasMotionFloatCurves: 0 + m_Events: [] diff --git a/Assets/Resources/Sprites/Games/SlotMonster/Animations/SlotMonster/Eyes/EyeItem8.anim.meta b/Assets/Resources/Sprites/Games/SlotMonster/Animations/SlotMonster/Eyes/EyeItem8.anim.meta new file mode 100644 index 000000000..a7d30c076 --- /dev/null +++ b/Assets/Resources/Sprites/Games/SlotMonster/Animations/SlotMonster/Eyes/EyeItem8.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 56ea73b768001094998667031f83931e +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sprites/Games/SlotMonster/Animations/SlotMonster/Eyes/EyeItem9.anim b/Assets/Resources/Sprites/Games/SlotMonster/Animations/SlotMonster/Eyes/EyeItem9.anim new file mode 100644 index 000000000..9a32affe5 --- /dev/null +++ b/Assets/Resources/Sprites/Games/SlotMonster/Animations/SlotMonster/Eyes/EyeItem9.anim @@ -0,0 +1,68 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!74 &7400000 +AnimationClip: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: EyeItem9 + serializedVersion: 6 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: [] + m_ScaleCurves: [] + m_FloatCurves: [] + m_PPtrCurves: + - curve: + - time: 0 + value: {fileID: 811989312, guid: 878a62db1eeb38d46a0db8e2b67b9730, type: 3} + attribute: m_Sprite + path: + classID: 212 + script: {fileID: 0} + m_SampleRate: 60 + m_WrapMode: 0 + m_Bounds: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + m_ClipBindingConstant: + genericBindings: + - serializedVersion: 2 + path: 0 + attribute: 0 + script: {fileID: 0} + typeID: 212 + customType: 23 + isPPtrCurve: 1 + pptrCurveMapping: + - {fileID: 811989312, guid: 878a62db1eeb38d46a0db8e2b67b9730, type: 3} + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 0.016666668 + m_OrientationOffsetY: 0 + m_Level: 0 + m_CycleOffset: 0 + m_HasAdditiveReferencePose: 0 + m_LoopTime: 1 + m_LoopBlend: 0 + m_LoopBlendOrientation: 0 + m_LoopBlendPositionY: 0 + m_LoopBlendPositionXZ: 0 + m_KeepOriginalOrientation: 0 + m_KeepOriginalPositionY: 1 + m_KeepOriginalPositionXZ: 0 + m_HeightFromFeet: 0 + m_Mirror: 0 + m_EditorCurves: [] + m_EulerEditorCurves: [] + m_HasGenericRootTransform: 0 + m_HasMotionFloatCurves: 0 + m_Events: [] diff --git a/Assets/Resources/Sprites/Games/SlotMonster/Animations/SlotMonster/Eyes/EyeItem9.anim.meta b/Assets/Resources/Sprites/Games/SlotMonster/Animations/SlotMonster/Eyes/EyeItem9.anim.meta new file mode 100644 index 000000000..9c2b5911f --- /dev/null +++ b/Assets/Resources/Sprites/Games/SlotMonster/Animations/SlotMonster/Eyes/EyeItem9.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 2415bac8c6dda4548b61bb25a9418009 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sprites/Games/SlotMonster/Animations/SlotMonster/Eyes/SMEyesAnim.controller b/Assets/Resources/Sprites/Games/SlotMonster/Animations/SlotMonster/Eyes/SMEyesAnim.controller index 9813ac5f6..e378942cf 100644 --- a/Assets/Resources/Sprites/Games/SlotMonster/Animations/SlotMonster/Eyes/SMEyesAnim.controller +++ b/Assets/Resources/Sprites/Games/SlotMonster/Animations/SlotMonster/Eyes/SMEyesAnim.controller @@ -1,5 +1,83 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!1102 &-8928242552024720853 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: EyeItem7 + 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: ffa035d8da30ebe43aa56e939b8ce32b, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1102 &-6743623408813432129 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: EyeItem2 + 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: dc7a7d5383b19834c8aabcdf8a5f27c4, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1102 &-6316917534077068332 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: EyeItem6 + 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: 7751e3f6226e5f542aae16261016dc5c, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: --- !u!1102 &-6197539994392744785 AnimatorState: serializedVersion: 6 @@ -26,6 +104,32 @@ AnimatorState: m_MirrorParameter: m_CycleOffsetParameter: m_TimeParameter: +--- !u!1102 &-3843911989080258261 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: EyeItem5 + 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: 6e1ba96447514e647aba73e15c315965, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: --- !u!1102 &-2791140895208106785 AnimatorState: serializedVersion: 6 @@ -52,6 +156,58 @@ AnimatorState: m_MirrorParameter: m_CycleOffsetParameter: m_TimeParameter: +--- !u!1102 &-2694232910518384254 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: EyeItem9 + 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: 2415bac8c6dda4548b61bb25a9418009, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1102 &-1901151751003222681 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: EyeItem10 + 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: 1b9fff39f1df4754a98fc517dd23d63d, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: --- !u!91 &9100000 AnimatorController: m_ObjectHideFlags: 0 @@ -74,6 +230,84 @@ AnimatorController: m_IKPass: 0 m_SyncedLayerAffectsTiming: 0 m_Controller: {fileID: 9100000} +--- !u!1102 &952280455617591163 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: EyeItem3 + 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: da95235c1fa31d646976372843395182, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1102 &2470653049829300177 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: EyeItem4 + 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: 6de11b9c83f4f08479efd163724b8ca5, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1102 &7376551247590835694 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: EyeItem8 + 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: 56ea73b768001094998667031f83931e, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: --- !u!1107 &8715946530165154024 AnimatorStateMachine: serializedVersion: 6 @@ -89,6 +323,36 @@ AnimatorStateMachine: - serializedVersion: 1 m_State: {fileID: -2791140895208106785} m_Position: {x: 270, y: 120, z: 0} + - serializedVersion: 1 + m_State: {fileID: 8903499826490072732} + m_Position: {x: 490, y: 120, z: 0} + - serializedVersion: 1 + m_State: {fileID: -6743623408813432129} + m_Position: {x: 490, y: 150, z: 0} + - serializedVersion: 1 + m_State: {fileID: 952280455617591163} + m_Position: {x: 490, y: 180, z: 0} + - serializedVersion: 1 + m_State: {fileID: 2470653049829300177} + m_Position: {x: 490, y: 210, z: 0} + - serializedVersion: 1 + m_State: {fileID: -3843911989080258261} + m_Position: {x: 490, y: 240, z: 0} + - serializedVersion: 1 + m_State: {fileID: -6316917534077068332} + m_Position: {x: 490, y: 270, z: 0} + - serializedVersion: 1 + m_State: {fileID: -8928242552024720853} + m_Position: {x: 490, y: 300, z: 0} + - serializedVersion: 1 + m_State: {fileID: 7376551247590835694} + m_Position: {x: 490, y: 330, z: 0} + - serializedVersion: 1 + m_State: {fileID: -2694232910518384254} + m_Position: {x: 490, y: 360, z: 0} + - serializedVersion: 1 + m_State: {fileID: -1901151751003222681} + m_Position: {x: 490, y: 390, z: 0} m_ChildStateMachines: [] m_AnyStateTransitions: [] m_EntryTransitions: [] @@ -99,3 +363,29 @@ AnimatorStateMachine: m_ExitPosition: {x: 800, y: 120, z: 0} m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} m_DefaultState: {fileID: -2791140895208106785} +--- !u!1102 &8903499826490072732 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: EyeItem1 + 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: 52fd2687cf282bf4c968e3c55a1a6782, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: diff --git a/Assets/Resources/Sprites/Games/SlotMonster/Animations/SlotMonster/SlotMonsterAnim.controller b/Assets/Resources/Sprites/Games/SlotMonster/Animations/SlotMonster/SlotMonsterAnim.controller index 41244b6e1..c358cd5b0 100644 --- a/Assets/Resources/Sprites/Games/SlotMonster/Animations/SlotMonster/SlotMonsterAnim.controller +++ b/Assets/Resources/Sprites/Games/SlotMonster/Animations/SlotMonster/SlotMonsterAnim.controller @@ -49,15 +49,15 @@ AnimatorStateMachine: m_Position: {x: 290, y: 160, z: 0} - serializedVersion: 1 m_State: {fileID: -8242077036306276272} - m_Position: {x: 325, y: 225, z: 0} + m_Position: {x: 290, y: 220, z: 0} m_ChildStateMachines: [] m_AnyStateTransitions: [] m_EntryTransitions: [] m_StateMachineTransitions: {} m_StateMachineBehaviours: [] - m_AnyStatePosition: {x: 220, y: 220, z: 0} + m_AnyStatePosition: {x: 220, y: 280, z: 0} m_EntryPosition: {x: 310, y: -70, z: 0} - m_ExitPosition: {x: 420, y: 220, z: 0} + m_ExitPosition: {x: 420, y: 280, z: 0} m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} m_DefaultState: {fileID: 2225565470325063441} --- !u!1102 &-2494457888778925992 diff --git a/Assets/Scripts/Games/SlotMonster/SlotMonster.cs b/Assets/Scripts/Games/SlotMonster/SlotMonster.cs index f4d145060..380f2cf08 100644 --- a/Assets/Scripts/Games/SlotMonster/SlotMonster.cs +++ b/Assets/Scripts/Games/SlotMonster/SlotMonster.cs @@ -1,6 +1,4 @@ using System; -using System.Linq; -using System.Collections; using System.Collections.Generic; using UnityEngine; @@ -8,6 +6,7 @@ using HeavenStudio.Util; using HeavenStudio.InputSystem; using Jukebox; +using System.Linq; namespace HeavenStudio.Games.Loaders { @@ -21,14 +20,17 @@ namespace HeavenStudio.Games.Loaders new GameAction("startInterval", "Start Interval") { function = delegate { - var e = eventCaller.currentEntity; - SlotMonster.instance.StartInterval(e.beat, e.length, e["auto"], e, 0); + if (eventCaller.gameManager.minigameObj.TryGetComponent(out SlotMonster instance)) { + var e = eventCaller.currentEntity; + instance.StartInterval(e.beat, e.length, e["auto"], e["eyeType"], e, 0); + } }, defaultLength = 3f, resizable = true, parameters = new List() { - new Param("auto", true, "Auto Pass Turn", "Toggle if the turn should be passed automatically at the end of the start interval.") + new Param("auto", true, "Auto Pass Turn", "Toggle if the turn should be passed automatically at the end of the start interval."), + new Param("eyeType", SlotMonster.EyeTypes.Random, "Eye Sprite", "Set the eye sprite to be used."), }, priority = 2, }, @@ -44,8 +46,28 @@ namespace HeavenStudio.Games.Loaders new GameAction("passTurn", "Pass Turn") { function = delegate { - var e = eventCaller.currentEntity; - SlotMonster.instance.PassTurn(e.beat, e.length); + if (eventCaller.gameManager.minigameObj.TryGetComponent(out SlotMonster instance)) { + var e = eventCaller.currentEntity; + instance.PassTurn(e.beat, e.length); + } + }, + defaultLength = 1f, + priority = 1, + }, + new GameAction("passTurn", "Pass Turn") + { + function = delegate { + if (eventCaller.gameManager.minigameObj.TryGetComponent(out SlotMonster instance)) { + var e = eventCaller.currentEntity; + instance.ButtonColor(new Color[] { e["button1"], e["button2"], e["button3"] }, e["flash"]); + } + }, + parameters = new List() + { + new Param("button1", new Color(), "Button 1 Color", "Set the color of the first button."), + new Param("button2", new Color(), "Button 2 Color", "Set the color of the second button."), + new Param("button3", new Color(), "Button 3 Color", "Set the color of the third button."), + new Param("flash", new Color(), "Button Flash Color", "Set the color of the flash of the buttons."), }, defaultLength = 1f, priority = 1, @@ -67,37 +89,50 @@ namespace HeavenStudio.Games Snare, } + public enum EyeTypes + { + Random, + Test1, + Test2, + Test3, + Test4, + Test5, + Test6, + Test7, + Test8, + Test9, + Test10, + } + [Header("Animators")] [SerializeField] Animator smAnim; + [SerializeField] Sprite[] eyeSprites; [SerializeField] Animator[] eyeAnims; + [SerializeField] SpriteRenderer[] eyeSRs; + [SerializeField] Animator[] buttonAnims; + // used to ease between button colors and button flash colors! wow + private Color[] buttonColors; + private Color buttonFlashColor; private List gameEntities; private Sound rollingSound; + private int currentEyeSprite = 1; + private int maxButtons; private int currentButton; - public static SlotMonster instance; + // public static SlotMonster instance; private void Awake() { - instance = this; + // eyeSRs = eyeAnims.Where(x => x.GetComponent()).ToArray(); } private void Update() { if (PlayerInput.GetIsAction(InputAction_BasicPress) && !IsExpectingInputNow(InputAction_BasicPress)) { - HitButton(); - } - } - - public override void OnGameSwitch(double beat) - { - gameEntities = GameManager.instance.Beatmap.Entities.FindAll(c => c.datamodel.Split('/')[0] == "slotMonster"); - List startIntervals = gameEntities.FindAll(e => e.datamodel == "slotMonster/startInterval" && e.beat < beat && e.beat + e.length > beat); - foreach (var interval in startIntervals) - { - StartInterval(interval.beat, interval.length, interval["auto"], interval, beat); + _ = HitButton(); } } @@ -106,35 +141,56 @@ namespace HeavenStudio.Games OnGameSwitch(beat); } + public override void OnGameSwitch(double beat) + { + gameEntities = GameManager.instance.Beatmap.Entities.FindAll(c => c.datamodel.Split('/')[0] == "slotMonster"); + foreach (RiqEntity interval in gameEntities.FindAll(e => e.datamodel == "slotMonster/startInterval" && e.beat < beat && e.beat + e.length > beat)) + { + StartInterval(interval.beat, interval.length, interval["auto"], interval["eyeType"], interval, beat); + } + } + // make sure the current button is always between 0 and 2 (buttons 1-3) private int GetCurrentButton() => currentButton %= 3; private bool HitButton(bool isHit = false) // returns true if it's the last one { int thisButton = GetCurrentButton(); - Debug.Log("BUTTON HIT : " + thisButton); - string hitSfx = "slotMonster/stop_" + (thisButton + 1); - if (thisButton == 2) { - if (isHit) hitSfx += "_hit"; - } + // Debug.Log("BUTTON HIT : " + thisButton); + bool lastButton = thisButton == maxButtons - 1; + string hitSfx = "slotMonster/stop_" + (lastButton && isHit ? "hit" : (thisButton + 1)); SoundByte.PlayOneShotGame(hitSfx, forcePlay: true); - buttonAnims[thisButton].DoScaledAnimationAsync("Press", 0.5f); + for (int i = thisButton; i < (lastButton ? 3 : thisButton + 1); i++) + { + buttonAnims[thisButton].DoScaledAnimationAsync("Press", 0.5f); + if (eyeAnims[thisButton].IsPlayingAnimationNames("Spin")) { + int eyeSprite = currentEyeSprite; + if (!isHit) { + do { + eyeSprite = UnityEngine.Random.Range(1, 10); + } while (eyeSprite == currentEyeSprite); + } + Debug.Log("EyeItem" + eyeSprite); + eyeAnims[thisButton].Play("EyeItem" + eyeSprite, 0, 0); + } + } currentButton++; - return thisButton == 2 && isHit; + return lastButton && isHit; } - public void StartInterval(double beat, float length, bool autoPass, RiqEntity startInterval, double gameSwitchBeat) + public void StartInterval(double beat, float length, bool autoPass, int eyeSprite, RiqEntity startInterval, double gameSwitchBeat) { List slotActions = gameEntities.FindAll(e => e.datamodel == "slotMonster/slot" && e.beat >= startInterval.beat && e.beat < startInterval.beat + startInterval.length); smAnim.DoScaledAnimationFromBeatAsync("Prepare", 0.5f, beat); SoundByte.PlayOneShotGame("slotMonster/start_touch", forcePlay: true); - Debug.Log(Mathf.Min(slotActions.Count, 3)); List sounds = new(); List actions = new(); - for (int i = 0; i < Mathf.Min(slotActions.Count, 3); i++) // limit to 3 actions + maxButtons = Mathf.Min(slotActions.Count, 3); + for (int i = 0; i < maxButtons; i++) // limit to 3 actions { + buttonAnims[i].Play("Idle", 0, 0); int whichSlot = i; RiqEntity slot = slotActions[whichSlot]; if (slot.beat < gameSwitchBeat) continue; @@ -144,33 +200,38 @@ namespace HeavenStudio.Games } else { sfx = Enum.GetName(typeof(DrumTypes), (int)slot["drum"]).ToLower(); } - Debug.Log(sfx); + // Debug.Log(sfx); sounds.Add(new(sfx + "DrumNTR", slot.beat)); actions.Add(new(slot.beat, delegate { - buttonAnims[whichSlot].DoScaledAnimationAsync("Flash", 0.5f); + // if (buttonAnims[whichSlot].IsAnimationNotPlaying()) { + // buttonAnims[whichSlot].DoScaledAnimationAsync("Flash", 0.5f); + // } })); } MultiSound.Play(sounds.ToArray(), false); BeatAction.New(this, actions); if (autoPass) { - BeatAction.New(this, new() { new(beat + length, delegate { PassTurn(beat + length, 1, beat, slotActions); }) }); + BeatAction.New(this, new() { new(beat + length, delegate { + currentEyeSprite = eyeSprite == 0 ? UnityEngine.Random.Range(1, 10) : eyeSprite; + PassTurn(beat + length, 1, beat, slotActions); + })}); } } public void PassTurn(double beat, float length, double startBeat = -1, List slotActions = null) { smAnim.DoScaledAnimationFromBeatAsync("Release", 0.5f, beat); - foreach (var eye in eyeAnims) + for (int i = 0; i < eyeAnims.Length; i++) { - eye.DoScaledAnimationAsync("Spin", 0.5f); + eyeAnims[i].DoScaledAnimationAsync("Spin", 0.5f); } SoundByte.PlayOneShotGame("slotMonster/start_rolling", forcePlay: true); rollingSound = SoundByte.PlayOneShotGame("slotMonster/rolling", looping: true, forcePlay: true); - if (slotActions == null) { + if (startBeat < 0 || slotActions == null) { var startInterval = gameEntities.FindLast(e => e.datamodel == "slotMonster/startInterval" && e.beat + e.length < beat); - if (startBeat < 0) startBeat = startInterval.beat; - slotActions = gameEntities.FindAll(e => e.datamodel == "slotMonster/slot" && e.beat >= startInterval.beat && e.beat < startInterval.beat + startInterval.length); + startBeat = startInterval.beat; + slotActions ??= gameEntities.FindAll(e => e.datamodel == "slotMonster/slot" && e.beat >= startInterval.beat && e.beat < startInterval.beat + startInterval.length); } List actions = new(); @@ -179,10 +240,10 @@ namespace HeavenStudio.Games int whichSlot = i; double slotBeat = slotActions[i].beat; - actions.Add(new(slotBeat + beat, delegate { buttonAnims[whichSlot].DoScaledAnimationAsync("Flash"); })); + // actions.Add(new(beat + length + slotBeat - startBeat, delegate { buttonAnims[whichSlot].DoScaledAnimationAsync("Flash"); })); - Debug.Log("input scheduled at : " + (beat + slotBeat - startBeat + 1)); - PlayerActionEvent input = ScheduleInput(beat, slotBeat - startBeat + 1, InputAction_BasicPress, ButtonHit, null, null); + // Debug.Log("input scheduled at : " + (beat + length + slotBeat - startBeat)); + PlayerActionEvent input = ScheduleInput(beat, slotBeat - startBeat + length, InputAction_BasicPress, ButtonHit, null, null); input.IsHittable = () => GetCurrentButton() == whichSlot; } BeatAction.New(this, actions); @@ -198,9 +259,15 @@ namespace HeavenStudio.Games if (state is >= 1f or <= -1f) SoundByte.PlayOneShot("nearMiss"); } - private void ButtonMiss(PlayerActionEvent caller) - { + // private void ButtonMiss(PlayerActionEvent caller) + // { + // } + + public void ButtonColor(Color[] baseColors, Color flashColor) + { + buttonColors = baseColors; + buttonFlashColor = flashColor; } } } \ No newline at end of file