From fbe02f40856a83bf7c841432fc67232a630b2254 Mon Sep 17 00:00:00 2001 From: Ino Date: Thu, 18 Dec 2025 09:50:03 +0900 Subject: [PATCH] =?UTF-8?q?=EB=B0=94=EC=8A=A4=ED=8A=B8=20=EB=AA=A8?= =?UTF-8?q?=ED=95=91=20=EC=A0=81=EC=9A=A9=20=EC=A0=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../HorseRush/Script/HorseRushPanel.cs | 44 ++++++++----------- Assets/nightward.txt | 3 +- 2 files changed, 21 insertions(+), 26 deletions(-) diff --git a/Assets/Resources/Prefabs/HorseRush/Script/HorseRushPanel.cs b/Assets/Resources/Prefabs/HorseRush/Script/HorseRushPanel.cs index 15bfc7b..7c38952 100644 --- a/Assets/Resources/Prefabs/HorseRush/Script/HorseRushPanel.cs +++ b/Assets/Resources/Prefabs/HorseRush/Script/HorseRushPanel.cs @@ -106,7 +106,7 @@ public class HorseRushPanel : AddrHandleBase #endregion - string m_normalBG, m_FeverBG; + string m_normalBG; private Animator _leftAnimator; private Animator _rightAnimator; @@ -214,7 +214,7 @@ public class HorseRushPanel : AddrHandleBase SoundInfo.Ins.Play_BGM(eBGM.b003_Fever); // _bottomFillImage.color = new Color(1, 0.84f, 0.33f, 1); - FadeFeverBg(m_Handle[m_FeverBG].Result as Sprite); + FadeFeverBg(true); LevelUpFever(); } @@ -224,7 +224,7 @@ public class HorseRushPanel : AddrHandleBase SoundInfo.Ins.Play_BGM(eBGM.b002_MiniGame); // _bottomFillImage.color = new Color(0.86f, 0, 0, 1); - FadeFeverBg(m_Handle[m_normalBG].Result as Sprite); + FadeFeverBg(false); } } @@ -287,26 +287,11 @@ public class HorseRushPanel : AddrHandleBase _isGameOver = false; + _background.gameObject.SetActive(true); var girlid = SaveMgr.Ins.m_SelectMiniGameGirl; - if (SaveMgr.Ins.m_SelectMiniGameTab == 1) - { - _background.gameObject.SetActive(false); - DSUtil.InActivateGameObjects(gos_sexy, girlid - 1); - } - - m_normalBG = table_album.Ins.Get_SpecialAlbum(girlid, eCollectionMethod.Default).s_Image; - m_FeverBG = table_album.Ins.Get_SpecialAlbum(girlid, eCollectionMethod.Mission).s_Image; - Load_Image(_background, m_FeverBG, () => - { - Load_Image(_background, m_normalBG, () => - { - if (SaveMgr.Ins.m_SelectMiniGameTab == 0) - { - _background.gameObject.SetActive(true); - FadeFeverBg(m_Handle[m_normalBG].Result as Sprite); - } - }); - }); + 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); }); //var albums = DataManager.Instance.GetAllPhotoDatas(); //var curPhotos = albums[GameManager.Instance.SelectedMinigameAlbum.ID]; @@ -341,6 +326,9 @@ public class HorseRushPanel : AddrHandleBase m_GachaCoint = 0; m_GachaCoint.Obfuscate(); m_ChatCoint = 0; m_ChatCoint.Obfuscate(); DEFAULT_FEVER_COUNT = 100; DEFAULT_FEVER_COUNT.Obfuscate(); +#if UNITY_EDITOR + DEFAULT_FEVER_COUNT = 20; +#endif // UI 초기화 _combo.SetActive(false); @@ -619,20 +607,26 @@ public class HorseRushPanel : AddrHandleBase } } - void FadeFeverBg(Sprite newSprite) + void FadeFeverBg(bool fever) { - if (SaveMgr.Ins.m_SelectMiniGameTab == 0) + if (!fever) { + DSUtil.InActivateGameObjects(gos_sexy); Sequence sequence = DOTween.Sequence(); + _background.gameObject.SetActive(true); _background.color = new Color(_background.color.r, _background.color.g, _background.color.b, 1f); - _background.sprite = newSprite; + _background.sprite = m_Handle[m_normalBG].Result as Sprite; sequence.Append(_background.DOFade(0, 0.15f)) .Append(_background.DOFade(1, 0.15f)); + } else + { + _background.gameObject.SetActive(false); DSUtil.InActivateGameObjects(gos_sexy, SaveMgr.Ins.m_SelectMiniGameGirl - 1); + } } void StartBounceEffect() diff --git a/Assets/nightward.txt b/Assets/nightward.txt index 42968f2..7e9da81 100644 --- a/Assets/nightward.txt +++ b/Assets/nightward.txt @@ -13,4 +13,5 @@ ¹Ì´Ï°ÔÀÓ ¹è°æ ¼³Á¤ - ÅÍÄ¡¿¡ µû¸¥ °¡½¿ ¹ÝÀÀ »ç¿îµå -¾Û ¾ÆÀÌÄÜ \ No newline at end of file +¾Û ¾ÆÀÌÄÜ +äÆÃ ÅäÅ« \ No newline at end of file