diff --git a/Assets/Microgames/KagerouCut/Animation/KagCutWin.anim b/Assets/Microgames/KagerouCut/Animation/KagCutWin.anim index 295743670..070ba8870 100644 --- a/Assets/Microgames/KagerouCut/Animation/KagCutWin.anim +++ b/Assets/Microgames/KagerouCut/Animation/KagCutWin.anim @@ -13,20 +13,30 @@ AnimationClip: m_RotationCurves: [] m_CompressedRotationCurves: [] m_EulerCurves: [] - m_PositionCurves: [] - m_ScaleCurves: [] - m_FloatCurves: [] - m_PPtrCurves: + m_PositionCurves: - curve: - - time: 0 - value: {fileID: 21300000, guid: 38f2552e8c0e44030a9bfd49cb87363c, type: 3} - - time: 1 - value: {fileID: 21300000, guid: 38f2552e8c0e44030a9bfd49cb87363c, type: 3} - attribute: m_Sprite + serializedVersion: 2 + m_Curve: + - serializedVersion: 2 + time: 0 + value: {x: 0, y: 0, z: 0} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + - serializedVersion: 2 + time: 0.18333334 + value: {x: -7.5, y: 0, z: 0} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 path: Face - classID: 212 - script: {fileID: 0} - m_SampleRate: 1 + m_ScaleCurves: [] + m_FloatCurves: [] + m_PPtrCurves: [] + m_SampleRate: 60 m_WrapMode: 0 m_Bounds: m_Center: {x: 0, y: 0, z: 0} @@ -35,20 +45,18 @@ AnimationClip: genericBindings: - serializedVersion: 2 path: 2770785369 - attribute: 0 + attribute: 1 script: {fileID: 0} - typeID: 212 - customType: 23 - isPPtrCurve: 1 - pptrCurveMapping: - - {fileID: 21300000, guid: 38f2552e8c0e44030a9bfd49cb87363c, type: 3} - - {fileID: 21300000, guid: 38f2552e8c0e44030a9bfd49cb87363c, type: 3} + typeID: 4 + customType: 0 + isPPtrCurve: 0 + pptrCurveMapping: [] m_AnimationClipSettings: serializedVersion: 2 m_AdditiveReferencePoseClip: {fileID: 0} m_AdditiveReferencePoseTime: 0 m_StartTime: 0 - m_StopTime: 2 + m_StopTime: 0.18333334 m_OrientationOffsetY: 0 m_Level: 0 m_CycleOffset: 0 @@ -63,7 +71,73 @@ AnimationClip: m_KeepOriginalPositionXZ: 0 m_HeightFromFeet: 0 m_Mirror: 0 - m_EditorCurves: [] + m_EditorCurves: + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 2 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + - serializedVersion: 2 + time: 0.18333334 + value: -7.5 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.x + path: Face + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 2 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + - serializedVersion: 2 + time: 0.18333334 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.y + path: Face + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 2 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + - serializedVersion: 2 + time: 0.18333334 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.z + path: Face + classID: 4 + script: {fileID: 0} m_EulerEditorCurves: [] m_HasGenericRootTransform: 0 m_HasMotionFloatCurves: 0 diff --git a/Assets/Microgames/KagerouCut/Prefabs/Character.prefab b/Assets/Microgames/KagerouCut/Prefabs/Character.prefab index 1c634c57b..de5703137 100644 --- a/Assets/Microgames/KagerouCut/Prefabs/Character.prefab +++ b/Assets/Microgames/KagerouCut/Prefabs/Character.prefab @@ -11,13 +11,45 @@ Prefab: m_ParentPrefab: {fileID: 0} m_RootGameObject: {fileID: 1958653161115180} m_IsPrefabParent: 1 ---- !u!1 &1918697340007126 +--- !u!1 &1245752637265784 +GameObject: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + serializedVersion: 5 + m_Component: + - component: {fileID: 4875147308956002} + - component: {fileID: 212266320381117916} + - component: {fileID: 114927060213759708} + m_Layer: 0 + m_Name: Win Face + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!1 &1413800626590550 GameObject: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} serializedVersion: 5 m_Component: + - component: {fileID: 4137079960736566} + m_Layer: 0 + m_Name: Face + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!1 &1918697340007126 +GameObject: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + serializedVersion: 5 + m_Component: - component: {fileID: 4439986702651964} - component: {fileID: 212342539615978866} - component: {fileID: 114380435207504266} @@ -46,6 +78,21 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 +--- !u!4 &4137079960736566 +Transform: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1413800626590550} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 4439986702651964} + - {fileID: 4875147308956002} + m_Father: {fileID: 4603745529108792} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!4 &4439986702651964 Transform: m_ObjectHideFlags: 1 @@ -56,7 +103,7 @@ Transform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] - m_Father: {fileID: 4603745529108792} + m_Father: {fileID: 4137079960736566} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!4 &4603745529108792 @@ -69,10 +116,23 @@ Transform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1.25, y: 1.25, z: 1} m_Children: - - {fileID: 4439986702651964} + - {fileID: 4137079960736566} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!4 &4875147308956002 +Transform: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1245752637265784} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 7.5, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 4137079960736566} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!95 &95885599011657246 Animator: serializedVersion: 3 @@ -109,6 +169,25 @@ MonoBehaviour: resetOnStop: 0 resetOnStart: 0 enableInEditor: 0 +--- !u!114 &114927060213759708 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1245752637265784} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f2854cd4e7d7a6842bc82f59df5b237e, type: 3} + m_Name: + m_EditorClassIdentifier: + _vibrateOn: 1 + vibrateSpeed: 6 + vibrateMaxX: 0.06 + vibrateMaxY: 0.06 + relativeToStartPosition: 1 + resetOnStop: 0 + resetOnStart: 0 + enableInEditor: 0 --- !u!114 &114977724529402630 MonoBehaviour: m_ObjectHideFlags: 1 @@ -120,7 +199,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 6b6ad2a27255c4c1aa0d65dbff54a8fb, type: 3} m_Name: m_EditorClassIdentifier: - vibrate: {fileID: 114380435207504266} --- !u!212 &212035893185867374 SpriteRenderer: m_ObjectHideFlags: 1 @@ -165,6 +243,50 @@ SpriteRenderer: m_SpriteTileMode: 0 m_WasSpriteAssigned: 1 m_MaskInteraction: 0 +--- !u!212 &212266320381117916 +SpriteRenderer: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1245752637265784} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + 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_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 0 + 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: 1 + m_Sprite: {fileID: 21300000, guid: 38f2552e8c0e44030a9bfd49cb87363c, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 9, y: 9} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 --- !u!212 &212342539615978866 SpriteRenderer: m_ObjectHideFlags: 1 diff --git a/Assets/Microgames/KagerouCut/Scripts/KagCutCharacter.cs b/Assets/Microgames/KagerouCut/Scripts/KagCutCharacter.cs index e7620dfaf..73bf00a0e 100644 --- a/Assets/Microgames/KagerouCut/Scripts/KagCutCharacter.cs +++ b/Assets/Microgames/KagerouCut/Scripts/KagCutCharacter.cs @@ -4,8 +4,8 @@ public class KagCutCharacter : MonoBehaviour { - [SerializeField] - private Vibrate vibrate; + //[SerializeField] + //private Vibrate vibrate; void Start () { @@ -18,13 +18,13 @@ void Start () void Update () { - if (MicrogameController.instance.getVictory()) - { - vibrate.enabled = true; - //vibrate.vibrateSpeed *= 2f; - vibrate.vibrateMaxX *= 2f; - vibrate.vibrateMaxY *= 2f; - enabled = false; - } + //if (MicrogameController.instance.getVictory()) + //{ + // vibrate.enabled = true; + // //vibrate.vibrateSpeed *= 2f; + // vibrate.vibrateMaxX *= 2f; + // vibrate.vibrateMaxY *= 2f; + // enabled = false; + //} } }