바스트 모핑

Assets/Resources/Prefabs/HorseRush/Script/HorseRushManager.cs

@@ -102,7 +102,8 @@ public class HorseRushManager : MonoBehaviour
         _horseRushPanel.GameStart(isFreeSweep);
     }
 
-    public void GameOver(bool isFreeSweep, long score, int normalDoubleScoreCount, int maxCombo, int maxFeverStreak, int missionSuccessPhotoID)
+    public void GameOver(bool isFreeSweep, long score, int normalDoubleScoreCount, int maxCombo, int maxFeverStreak,
+        int missionSuccessPhotoID, Action actend)
     {
         if (isFreeSweep)
         {
@@ -119,10 +120,10 @@ public class HorseRushManager : MonoBehaviour
         }
 
         // _horseRushPanel.gameObject.SetActive(false);
-        GetReward(score, normalDoubleScoreCount, maxCombo, maxFeverStreak, missionSuccessPhotoID);
+        GetReward(score, normalDoubleScoreCount, maxCombo, maxFeverStreak, missionSuccessPhotoID, actend);
     }
 
-    public void GetReward(long coinAmount, int rubyAmount, int maxCombo, int maxFeverStreak, int missionSuccessPhotoID)
+    public void GetReward(long coinAmount, int rubyAmount, int maxCombo, int maxFeverStreak, int missionSuccessPhotoID, Action actend)
     {
         // 갑자기 하트 관련 보상 기획이 변경되어서 임시 주석 언제 다시 추가할지 모르겠음
         // int heartAmount = GetHeartAmount(maxFeverStreak);
@@ -147,8 +148,7 @@ public class HorseRushManager : MonoBehaviour
         SaveMgr.Ins.Add_Money(eMoney.Gacha, (int)coinAmount);
         SaveMgr.Ins.Add_Money(eMoney.AlbumOpen, rubyAmount);
         SaveMgr.Ins.Save();
-        m_MiniGameResult.Set(coinAmount, bonuscoin, rubyAmount, maxCombo, maxFeverStreak, missionSuccessPhotoID,
+        m_MiniGameResult.Set(coinAmount, bonuscoin, rubyAmount, maxCombo, maxFeverStreak, missionSuccessPhotoID, actend);
-            () => { _horseRushPanel.gameObject.SetActive(false); });
 
         if (maxFeverStreak >= _missionFeverCount && missionSuccessPhotoID != -1)
         {

Assets/Resources/Prefabs/HorseRush/Script/HorseRushPanel.cs

@@ -124,6 +124,8 @@ public class HorseRushPanel : AddrHandleBase
     // 애니메이션 진행 여부 확인용 플래그 변수 추가
     private bool _isAnimationPlaying = false;
 
+    BreastJigglePhysics[] breast;
+
     void Awake()
     {
         STUN_TIME = 0.5f;
@@ -178,7 +180,9 @@ public class HorseRushPanel : AddrHandleBase
         {
             _isGameStart = false;
             _isGameOver = true;
-            _horseRushManager.GameOver(_isFree, _score, _normalDoubleScoreCount, _maxcombo, _maxFeverStreak, _missionSuccessPhotoID);
+            _horseRushManager.GameOver(
+                _isFree, _score, _normalDoubleScoreCount, _maxcombo, _maxFeverStreak, _missionSuccessPhotoID,
+                OnClick_GameLeave);
 
             //gameObject.SetActive(false);
         }
@@ -210,7 +214,7 @@ public class HorseRushPanel : AddrHandleBase
 
         if (canDefaultComboCondition && canFeverIncreaseCondition)
         {
-            Debug.Log("<color=red>###### F E V E R ######</color>");
+            //Debug.Log("<color=red>###### F E V E R ######</color>");
             SoundInfo.Ins.Play_BGM(eBGM.b003_Fever);
             // _bottomFillImage.color = new Color(1, 0.84f, 0.33f, 1);
 
@@ -292,24 +296,7 @@ public class HorseRushPanel : AddrHandleBase
         m_normalBG = table_album.Ins.Get_SpecialAlbum(girlid,
              SaveMgr.Ins.m_SelectMiniGameTab == 0 ? eCollectionMethod.Default : eCollectionMethod.FullCollection).s_Image;
         Load_Image(_background, m_normalBG, () => { FadeFeverBg(false); });
-
+        breast = gos_sexy[girlid - 1].GetComponentsInChildren<BreastJigglePhysics>(true);
-        //var albums = DataManager.Instance.GetAllPhotoDatas();
-        //var curPhotos = albums[GameManager.Instance.SelectedMinigameAlbum.ID];
-        //foreach (var photo in curPhotos.Values)
-        //{
-        //    if (photo.CollectionMethod == NerdNavis.AdultGacha.Enum.CollectionMethod.FullCollection)
-        //    {
-        //        _feverBgSprite = Resources.Load<Sprite>(photo.ImagePath);
-        //    }
-        //    else if (GameManager.Instance.CurrentMinigameType == GameManager.MinigameType.Sexy && photo.CollectionMethod == NerdNavis.AdultGacha.Enum.CollectionMethod.Mission)
-        //    {
-        //        _normalBgSprite = Resources.Load<Sprite>(photo.ImagePath);
-        //    }
-        //    else if (GameManager.Instance.CurrentMinigameType == GameManager.MinigameType.General && photo.CollectionMethod == NerdNavis.AdultGacha.Enum.CollectionMethod.Default)
-        //    {
-        //        _normalBgSprite = Resources.Load<Sprite>(photo.ImagePath);
-        //    }
-        //}
 
         // 게임 상태 초기화
         _isFree = isFree;
@@ -417,6 +404,21 @@ public class HorseRushPanel : AddrHandleBase
                 m_ChatCoint += lastBubbleCard.IsHeartCarrot ? 1 : 0;
                 m_ChatCoint.Obfuscate();
             }
+            else
+            {
+                breast[0].Set_Force();
+                breast[1].Set_Force();
+                //if (isTouchLeft)
+                //{
+                //    if (breast[0].bLeft) breast[0].Set_Force();
+                //    if (breast[1].bLeft) breast[1].Set_Force();
+                //}
+                //else
+                //{
+                //    if (!breast[0].bLeft) breast[0].Set_Force();
+                //    if (!breast[1].bLeft) breast[1].Set_Force();
+                //}
+            }
         }
         else
         {
@@ -435,7 +437,8 @@ public class HorseRushPanel : AddrHandleBase
             {
                 _isGameStart = false;
                 _isGameOver = true;
-                _horseRushManager.GameOver(_isFree, _score, _normalDoubleScoreCount, _maxcombo, _maxFeverStreak, _missionSuccessPhotoID);
+                _horseRushManager.GameOver(_isFree, _score, _normalDoubleScoreCount, _maxcombo, _maxFeverStreak,
+                    _missionSuccessPhotoID, OnClick_GameLeave);
             }
             else
             {
@@ -603,7 +606,7 @@ public class HorseRushPanel : AddrHandleBase
         else
         {
             _addRushTimeValue = Mathf.Max(0.2f, ((BONUS_TIME * 100f) - Mathf.Round(_totalComboCount / (30f / _totalComboCount * 150f))) / 100f);
-            Debug.Log($"addRushTimeValue: {_addRushTimeValue}");
+            //Debug.Log($"addRushTimeValue: {_addRushTimeValue}");
         }
     }
 
@@ -626,6 +629,8 @@ public class HorseRushPanel : AddrHandleBase
         {
             _background.gameObject.SetActive(false);
             DSUtil.InActivateGameObjects(gos_sexy, SaveMgr.Ins.m_SelectMiniGameGirl - 1);
+            breast[0].ApplyJellySpriteSettings();
+            breast[1].ApplyJellySpriteSettings();
         }
     }
 

Assets/Scripts/Game/BreastJigglePhysics.cs

@@ -1,5 +1,4 @@
 using UnityEngine;
-using UnityEditor;
 /**
  * Free body 설정, 
  * 각각의 Radius는 값이 크면, 묵직하고 관성이 강해짐, 외부 힘에 덜 민감하고, 흔들리더라도 천천히 크게 출렁이며 진동이 오래 남아. 가슴의 중심부에 배치해서 무거운 느낌을 줄 때 사용.
@@ -11,6 +10,8 @@ using UnityEditor;
 [RequireComponent(typeof(JellySprite))]
 public class BreastJigglePhysics : MonoBehaviour
 {
+    public bool bLeft = true;
+
     [Header("=== JellySprite 물리 설정 ===")]
     [Tooltip("JellySprite 물리 속성을 이 스크립트 값으로 자동 적용. (기본: True)")]
     public bool autoConfigureJellySprite = true;
@@ -109,7 +110,7 @@ public class BreastJigglePhysics : MonoBehaviour
     }
 
     /// <summary>JellySprite 물리 속성 적용</summary>
-    private void ApplyJellySpriteSettings()
+    public void ApplyJellySpriteSettings()
     {
         jelly.m_Stiffness = stiffness;
         jelly.m_DampingRatio = dampingRatio;
@@ -145,9 +146,7 @@ public class BreastJigglePhysics : MonoBehaviour
             ApplyJellySpriteSettings();
     }
 
-    private void Update()
+    public void Set_Force()
-    {
-        if (Input.GetKeyDown(KeyCode.Space))
     {
         if (Time.time - lastCollisionTime < minCollisionInterval)
         {
@@ -158,18 +157,9 @@ public class BreastJigglePhysics : MonoBehaviour
 
         lastCollisionTime = Time.time;
 
-            //jelly.m_Stiffness = 2.6f;
         ApplyJellyForceForPlayer(DSUtil.RandomVector(0.01f, 0.1f), playerJiggleStrength);
     }
 
-        // 멈추기 실패
-        //if (Time.time - lastCollisionTime > 1f)
-        //{
-        //    lastCollisionTime = Time.time;
-        //    jelly.m_Stiffness = 0f;
-        //}
-    }
-
     private void HandleCollision(Collider2D other)
     {
         //if (!other.CompareTag("Player") && !other.CompareTag("Ball")) return;