Fan Club: particle stuff, unarranged crouch / kiss

Assets/Resources/Sprites/Games/FanClub/Animations/Arisa/Arisa.controller

@@ -130,6 +130,32 @@ AnimatorState:
   m_MirrorParameter: 
   m_CycleOffsetParameter: 
   m_TimeParameter: 
+--- !u!1102 &-4078493811055827895
+AnimatorState:
+  serializedVersion: 6
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: IdolSquat1Arrange
+  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: 91a0f665af1002b41a6839faf9836154, type: 2}
+  m_Tag: 
+  m_SpeedParameter: 
+  m_MirrorParameter: 
+  m_CycleOffsetParameter: 
+  m_TimeParameter: 
 --- !u!1102 &-2117704515032598726
 AnimatorState:
   serializedVersion: 6
@@ -589,6 +615,12 @@ AnimatorStateMachine:
   - serializedVersion: 1
     m_State: {fileID: 8217445718083616748}
     m_Position: {x: 1120, y: 1000, z: 0}
+  - serializedVersion: 1
+    m_State: {fileID: 3273527406978970790}
+    m_Position: {x: 1155, y: 1065, z: 0}
+  - serializedVersion: 1
+    m_State: {fileID: -4078493811055827895}
+    m_Position: {x: 1190, y: 1130, z: 0}
   m_ChildStateMachines: []
   m_AnyStateTransitions: []
   m_EntryTransitions: []
@@ -625,6 +657,32 @@ AnimatorState:
   m_MirrorParameter: 
   m_CycleOffsetParameter: 
   m_TimeParameter: 
+--- !u!1102 &3273527406978970790
+AnimatorState:
+  serializedVersion: 6
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: IdolSquat0Arrange
+  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: 239dc122fb33c4d4a96766305357f479, type: 2}
+  m_Tag: 
+  m_SpeedParameter: 
+  m_MirrorParameter: 
+  m_CycleOffsetParameter: 
+  m_TimeParameter: 
 --- !u!1102 &3286283311672979230
 AnimatorState:
   serializedVersion: 6

Assets/Resources/Sprites/Games/FanClub/Animations/Arisa/Arrange/IdolLandArrange.anim

@@ -61,7 +61,7 @@ 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.4
+        time: 0.36666667
         value: {x: 0, y: 0, z: 0}
         inSlope: {x: -0, y: -0, z: -0}
         outSlope: {x: 0, y: 0, z: -5.477464}
@@ -643,10 +643,10 @@ 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.4
+        time: 0.36666667
         value: {x: 0.7, y: 0.25, z: 0}
         inSlope: {x: -0, y: -0, z: -0}
-        outSlope: {x: 1.6500003, y: 2.7000003, z: 0}
+        outSlope: {x: 0.82500017, y: 1.3500001, z: 0}
         tangentMode: 0
         weightedMode: 0
         inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
@@ -654,7 +654,7 @@ AnimationClip:
       - serializedVersion: 3
         time: 0.43333334
         value: {x: 0.755, y: 0.34, z: 0}
-        inSlope: {x: 1.6500003, y: 2.7000003, z: -0}
+        inSlope: {x: 0.82500017, y: 1.3500001, z: -0}
         outSlope: {x: -1.0799996, y: -2.1000001, z: 0}
         tangentMode: 0
         weightedMode: 0
@@ -2601,10 +2601,10 @@ AnimationClip:
         inWeight: 0.33333334
         outWeight: 0.33333334
       - serializedVersion: 3
-        time: 0.4
+        time: 0.36666667
         value: 0.7
         inSlope: -0
-        outSlope: 1.6500003
+        outSlope: 0.82500017
         tangentMode: 69
         weightedMode: 0
         inWeight: 0.33333334
@@ -2612,7 +2612,7 @@ AnimationClip:
       - serializedVersion: 3
         time: 0.43333334
         value: 0.755
-        inSlope: 1.6500003
+        inSlope: 0.82500017
         outSlope: -1.0799996
         tangentMode: 69
         weightedMode: 0
@@ -2656,10 +2656,10 @@ AnimationClip:
         inWeight: 0.33333334
         outWeight: 0.33333334
       - serializedVersion: 3
-        time: 0.4
+        time: 0.36666667
         value: 0.25
         inSlope: -0
-        outSlope: 2.7000003
+        outSlope: 1.3500001
         tangentMode: 69
         weightedMode: 0
         inWeight: 0.33333334
@@ -2667,7 +2667,7 @@ AnimationClip:
       - serializedVersion: 3
         time: 0.43333334
         value: 0.34
-        inSlope: 2.7000003
+        inSlope: 1.3500001
         outSlope: -2.1000001
         tangentMode: 69
         weightedMode: 0
@@ -2711,7 +2711,7 @@ AnimationClip:
         inWeight: 0.33333334
         outWeight: 0.33333334
       - serializedVersion: 3
-        time: 0.4
+        time: 0.36666667
         value: 0
         inSlope: -0
         outSlope: 0
@@ -2766,7 +2766,7 @@ AnimationClip:
         inWeight: 0.33333334
         outWeight: 0.33333334
       - serializedVersion: 3
-        time: 0.4
+        time: 0.36666667
         value: 0
         inSlope: -0
         outSlope: 0
@@ -2821,7 +2821,7 @@ AnimationClip:
         inWeight: 0.33333334
         outWeight: 0.33333334
       - serializedVersion: 3
-        time: 0.4
+        time: 0.36666667
         value: 0
         inSlope: -0
         outSlope: 0
@@ -2876,7 +2876,7 @@ AnimationClip:
         inWeight: 0.33333334
         outWeight: 0.33333334
       - serializedVersion: 3
-        time: 0.4
+        time: 0.36666667
         value: 0
         inSlope: -0
         outSlope: -5.477464

Assets/Resources/Sprites/Games/FanClub/Animations/Arisa/Arrange/IdolSquat0Arrange.anim.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 239dc122fb33c4d4a96766305357f479
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 7400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Resources/Sprites/Games/FanClub/Animations/Arisa/Arrange/IdolSquat1Arrange.anim.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 91a0f665af1002b41a6839faf9836154
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 7400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Resources/Sprites/Games/FanClub/fanClub_IdolParts.png.meta

@@ -1776,7 +1776,7 @@ TextureImporter:
         width: 67
         height: 61
       alignment: 0
-      pivot: {x: 0, y: 0}
+      pivot: {x: 0.5, y: 0.5}
       border: {x: 0, y: 0, z: 0, w: 0}
       outline: []
       physicsShape: []
@@ -1797,7 +1797,7 @@ TextureImporter:
         width: 47
         height: 67
       alignment: 0
-      pivot: {x: 0, y: 0}
+      pivot: {x: 0.5, y: 0.5}
       border: {x: 0, y: 0, z: 0, w: 0}
       outline: []
       physicsShape: []
@@ -1818,7 +1818,7 @@ TextureImporter:
         width: 53
         height: 69
       alignment: 0
-      pivot: {x: 0, y: 0}
+      pivot: {x: 0.5, y: 0.5}
       border: {x: 0, y: 0, z: 0, w: 0}
       outline: []
       physicsShape: []
@@ -1834,12 +1834,12 @@ TextureImporter:
       name: ntrIdol_heartEffect
       rect:
         serializedVersion: 2
-        x: 1563
+        x: 1569
         y: 756
-        width: 69
+        width: 67
-        height: 67
+        height: 69
       alignment: 0
-      pivot: {x: 0, y: 0}
+      pivot: {x: 0.5, y: 0.5}
       border: {x: 0, y: 0, z: 0, w: 0}
       outline: []
       physicsShape: []
@@ -1860,7 +1860,7 @@ TextureImporter:
         width: 45
         height: 111
       alignment: 0
-      pivot: {x: 0, y: 0}
+      pivot: {x: 0.5, y: 0.5}
       border: {x: 0, y: 0, z: 0, w: 0}
       outline: []
       physicsShape: []
@@ -1881,7 +1881,7 @@ TextureImporter:
         width: 49
         height: 95
       alignment: 0
-      pivot: {x: 0, y: 0}
+      pivot: {x: 0.5, y: 0.5}
       border: {x: 0, y: 0, z: 0, w: 0}
       outline: []
       physicsShape: []
@@ -1902,7 +1902,7 @@ TextureImporter:
         width: 27
         height: 63
       alignment: 0
-      pivot: {x: 0, y: 0}
+      pivot: {x: 0.5, y: 0.5}
       border: {x: 0, y: 0, z: 0, w: 0}
       outline: []
       physicsShape: []

Assets/Scripts/Games/FanClub/FanClub.cs

@@ -366,15 +366,15 @@ namespace HeavenStudio.Games
                 case (int) IdolAnimations.BigCall:
                     BeatAction.New(Arisa, new List<BeatAction.Action>()
                     {
-                        new BeatAction.Action(beat,             delegate { Arisa.GetComponent<Animator>().Play("IdolBigCall0", -1, 0); }),
+                        new BeatAction.Action(beat,             delegate { Arisa.GetComponent<Animator>().Play("IdolBigCall0" + GetPerformanceSuffix(), -1, 0); }),
-                        new BeatAction.Action(beat + length,    delegate { Arisa.GetComponent<Animator>().Play("IdolBigCall1", -1, 0); }),
+                        new BeatAction.Action(beat + length,    delegate { Arisa.GetComponent<Animator>().Play("IdolBigCall1" + GetPerformanceSuffix(), -1, 0); }),
                     });
                     break;
                 case (int) IdolAnimations.Squat:
                     BeatAction.New(Arisa, new List<BeatAction.Action>()
                     {
-                        new BeatAction.Action(beat,             delegate { Arisa.GetComponent<Animator>().Play("IdolSquat0", -1, 0); }),
+                        new BeatAction.Action(beat,             delegate { Arisa.GetComponent<Animator>().Play("IdolSquat0" + GetPerformanceSuffix(), -1, 0); }),
-                        new BeatAction.Action(beat + length,    delegate { Arisa.GetComponent<Animator>().Play("IdolSquat1", -1, 0); }),
+                        new BeatAction.Action(beat + length,    delegate { Arisa.GetComponent<Animator>().Play("IdolSquat1" + GetPerformanceSuffix(), -1, 0); }),
                     });
                     break;
                 case (int) IdolAnimations.Wink:

Assets/Scripts/Games/FanClub/NtrIdolAri.cs

@@ -7,6 +7,7 @@ public class NtrIdolAri : MonoBehaviour
     [Header("Objects")]
     public ParticleSystem idolClapEffect;
     public ParticleSystem idolWinkEffect;
+    public ParticleSystem idolKissEffect;
 
     public void ClapParticle()
     {
@@ -17,4 +18,9 @@ public class NtrIdolAri : MonoBehaviour
     {
         idolWinkEffect.Play();
     }
+
+    public void KissParticle()
+    {
+        idolKissEffect.Play();
+    }
 }