From ce5a3cffe7abc1d443e596cdc711468cecf0a315 Mon Sep 17 00:00:00 2001 From: Ino Date: Fri, 7 Nov 2025 16:38:02 +0900 Subject: [PATCH] =?UTF-8?q?"1.=20=EB=AF=B8=EB=8B=88=EA=B2=8C=EC=9E=84=20?= =?UTF-8?q?=EC=9E=85=EC=9E=A5=20=EA=B8=B0=ED=9A=8C=EA=B0=80=20=EC=97=86?= =?UTF-8?q?=EC=9D=84=20=EB=95=8C=EB=8A=94=20=EB=B2=84=ED=8A=BC=EC=9D=84=20?= =?UTF-8?q?=ED=9A=8C=EC=83=89=EC=9C=BC=EB=A1=9C=20=EB=B3=80=EA=B2=BD=20?= =?UTF-8?q?=EB=B6=80=ED=83=81=EB=93=9C=EB=A6=BD=EB=8B=88=EB=8B=A4.=202.=20?= =?UTF-8?q?=EC=86=8C=EC=88=98=EC=A0=90=EC=9D=80=201=EC=9E=90=EB=A6=AC?= =?UTF-8?q?=EA=B9=8C=EC=A7=80=EB=A7=8C=20=ED=91=9C=EA=B8=B0=ED=95=B4?= =?UTF-8?q?=EB=8F=84=20=EB=90=A0=20=EA=B2=83=20=EA=B0=99=EC=8A=B5=EB=8B=88?= =?UTF-8?q?=EB=8B=A4.=20(=E2=80=BB=EB=BD=91=EA=B8=B0=20UI=EC=97=90?= =?UTF-8?q?=EB=8F=84=20=EB=8F=99=EC=9D=BC)=203.=20=EB=AF=B8=EB=8B=88?= =?UTF-8?q?=EA=B2=8C=EC=9E=84=20=EC=9E=85=EC=9E=A5=20=EA=B8=B0=ED=9A=8C?= =?UTF-8?q?=EA=B0=80=20=EC=97=86=EC=9D=84=20=EB=95=8C=20=EB=B2=84=ED=8A=BC?= =?UTF-8?q?=20=EB=88=84=EB=A5=B4=EB=A9=B4=20""=ED=95=98=ED=8A=B8=EA=B0=80?= =?UTF-8?q?=20=EB=B6=80=EC=A1=B1=ED=95=A9=EB=8B=88=EB=8B=A4.""=20=EB=9D=BC?= =?UTF-8?q?=EB=8A=94=20=ED=86=A0=EC=8A=A4=ED=8A=B8=20=EB=A9=94=EC=8B=9C?= =?UTF-8?q?=EC=A7=80=20=EC=B6=9C=EB=A0=A5=20=EB=B6=80=ED=83=81=EB=93=9C?= =?UTF-8?q?=EB=A6=BD=EB=8B=88=EB=8B=A4.=204.=20=EB=BD=91=EA=B8=B0=20?= =?UTF-8?q?=EB=A9=94=EB=89=B4=EC=97=90=EC=84=9C=20=EB=BD=91=EA=B8=B0=20?= =?UTF-8?q?=EC=9E=AC=ED=99=94=EA=B0=80=20=EB=B6=80=EC=A1=B1=ED=95=A0=20?= =?UTF-8?q?=EB=95=8C=EC=97=90=EB=8F=84=20=EB=B2=84=ED=8A=BC=EC=9D=84=20?= =?UTF-8?q?=ED=9A=8C=EC=83=89=EC=9C=BC=EB=A1=9C=20=EB=82=98=EC=98=A4?= =?UTF-8?q?=EA=B2=8C=20=EC=B2=98=EB=A6=AC=20=EB=B6=80=ED=83=81=EB=93=9C?= =?UTF-8?q?=EB=A6=BD=EB=8B=88=EB=8B=A4."?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../UI_Image/Common/MiniGameGray_btn.png.meta | 3 ++- Assets/Scenes/SampleScene.unity | 3 ++- Assets/Scripts/AttachToGameObject/SaveMgr.cs | 4 +++- Assets/Scripts/UI/GachaUI.cs | 2 +- Assets/Scripts/UI/LobbyUI.cs | 16 +++++++++++++--- ProjectSettings/ProjectSettings.asset | 1 + ProjectSettings/UnityConnectSettings.asset | 8 +++++--- 7 files changed, 27 insertions(+), 10 deletions(-) diff --git a/Assets/ResWork/UI_Image/Common/MiniGameGray_btn.png.meta b/Assets/ResWork/UI_Image/Common/MiniGameGray_btn.png.meta index 84ee038..d85191c 100644 --- a/Assets/ResWork/UI_Image/Common/MiniGameGray_btn.png.meta +++ b/Assets/ResWork/UI_Image/Common/MiniGameGray_btn.png.meta @@ -160,7 +160,8 @@ TextureImporter: secondaryTextures: [] spriteCustomMetadata: entries: [] - nameFileIdTable: {} + nameFileIdTable: + MiniGameGray_btn_0: 7978507074057238709 mipmapLimitGroupName: pSDRemoveMatte: 0 userData: diff --git a/Assets/Scenes/SampleScene.unity b/Assets/Scenes/SampleScene.unity index ba5f00d..82e9063 100644 --- a/Assets/Scenes/SampleScene.unity +++ b/Assets/Scenes/SampleScene.unity @@ -38521,7 +38521,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 97c84f1ff60498c439a184ed0e0acbec, type: 3} + m_Sprite: {fileID: 21300000, guid: ffedcc4b1712a7d47aef8352f6ab21cf, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -67230,6 +67230,7 @@ MonoBehaviour: - {fileID: 2057533035} - {fileID: 1227751126} go_minigamechargingbtn: {fileID: 2079832695} + i_minigamechargingbtn: {fileID: 2079832699} slider_minigamecharging: {fileID: 404172103} t_minigamechargingtime: {fileID: 644731195} m_AttandanceUI: {fileID: 388368217} diff --git a/Assets/Scripts/AttachToGameObject/SaveMgr.cs b/Assets/Scripts/AttachToGameObject/SaveMgr.cs index 1ab7615..770c432 100644 --- a/Assets/Scripts/AttachToGameObject/SaveMgr.cs +++ b/Assets/Scripts/AttachToGameObject/SaveMgr.cs @@ -181,12 +181,14 @@ public class SaveMgr : MonoBehaviourSingletonTemplate LobbyUI.Ins.m_ToastUI.Set("채팅 코인이 부족합니다.", toasty); break; case eMoney.Gacha: - LobbyUI.Ins.m_ToastUI.Set("뽑기 재화가 부족합니다.", toasty); + LobbyUI.Ins.m_ToastUI.Set("별 코인이 부족합니다.", toasty); break; case eMoney.Lucky: LobbyUI.Ins.m_ToastUI.Set("럭키 포인트가 부족합니다.", toasty); break; case eMoney.MiniGameHP: + LobbyUI.Ins.m_ToastUI.Set("생명력이 부족합니다.", toasty); + break; case eMoney.ItemBomb: case eMoney.ItemUmbrella: case eMoney.ItemDildo: diff --git a/Assets/Scripts/UI/GachaUI.cs b/Assets/Scripts/UI/GachaUI.cs index 484d203..5c0446c 100644 --- a/Assets/Scripts/UI/GachaUI.cs +++ b/Assets/Scripts/UI/GachaUI.cs @@ -38,7 +38,7 @@ public class GachaUI : uScrollViewMgr var cal = GachaAutoRefillTime - InternetTime.Ins.Time; fRefillTime -= Time.deltaTime; if (cal.TotalSeconds <= 0) fRefillTime = 0f; - texts[3].text = fRefillTime > 0f ? $"{fRefillTime:F2}s" : "0s"; + texts[3].text = fRefillTime > 0f ? $"{fRefillTime:F1}s" : "0s"; var fRefillTimeMax = table_GlobalValue.Ins.Get_Float("GachaAutoRefill_DelayTime"); if (SaveMgr.Ins.GachaChargeTime_Reduce()) fRefillTimeMax -= fRefillTimeMax * 0.9f; slider_charge.value = DSUtil.Get_SliderValue(fRefillTime / fRefillTimeMax); diff --git a/Assets/Scripts/UI/LobbyUI.cs b/Assets/Scripts/UI/LobbyUI.cs index 97ced54..32771c5 100644 --- a/Assets/Scripts/UI/LobbyUI.cs +++ b/Assets/Scripts/UI/LobbyUI.cs @@ -7,6 +7,7 @@ public class LobbyUI : MonoBehaviourSingletonTemplate { [SerializeField] TextMeshProUGUI[] texts_money; // 0 앨범 개방 재화, 1 채팅 재화, 2 뽑기 재화, 3 4 미니게임 체력 public GameObject go_minigamechargingbtn; + public Image i_minigamechargingbtn; public Slider slider_minigamecharging; public TextMeshProUGUI t_minigamechargingtime; float minigamechargingTime = 0f; @@ -49,6 +50,7 @@ public class LobbyUI : MonoBehaviourSingletonTemplate minigamechargingTime = (float)(SaveMgr.Ins.Get_MiniGameTime() - InternetTime.Ins.Time).TotalMilliseconds * 0.001f; go_minigamechargingbtn.SetActive(minigamechargingTime > 0f); if (minigamechargingTime <= 0f) Check_MiniGameCharging(); + Set_i_minigamechargingbtn(); bUpdate = true; } @@ -62,7 +64,7 @@ public class LobbyUI : MonoBehaviourSingletonTemplate if (!SaveMgr.Ins.Check_Money(eMoney.MiniGameHP, table_GlobalValue.Ins.Get_Int("MiniGame_TotalEnterMoney"), false)) { minigamechargingTime -= Time.deltaTime; - t_minigamechargingtime.text = minigamechargingTime > 0f ? $"{minigamechargingTime:F2}s" : "0s"; + t_minigamechargingtime.text = minigamechargingTime > 0f ? $"{minigamechargingTime:F1}s" : "0s"; var fRefillTimeMax = table_GlobalValue.Ins.Get_Float("MiniGame_EnterMoney_Time"); slider_minigamecharging.value = DSUtil.Get_SliderValue(minigamechargingTime / fRefillTimeMax); @@ -73,7 +75,7 @@ public class LobbyUI : MonoBehaviourSingletonTemplate void MiniGameCharging() { SaveMgr.Ins.Add_Money(eMoney.MiniGameHP); - m_ToastUI.Set($"미니게임 체력이 충전되었습니다."); + m_ToastUI.Set($"생명력이 충전되었습니다."); Check_MiniGameCharging(); Set_Money(); SaveMgr.Ins.Save(); @@ -91,6 +93,14 @@ public class LobbyUI : MonoBehaviourSingletonTemplate } if (CurMenu == 2) go_minigamechargingbtn.SetActive(minigamechargingTime > 0f); + Set_i_minigamechargingbtn(); + } + void Set_i_minigamechargingbtn() + { + if (!SaveMgr.Ins.Check_Money(eMoney.MiniGameHP, 1, false)) + i_minigamechargingbtn.sprite = UIAtlasMgr.Ins.Get_Sprite("MiniGameGray_btn"); + else + i_minigamechargingbtn.sprite = UIAtlasMgr.Ins.Get_Sprite("red btn"); } public void OnClick_Button(GameObject btn) @@ -155,7 +165,7 @@ public class LobbyUI : MonoBehaviourSingletonTemplate return; } - if (SaveMgr.Ins.Check_Money(eMoney.MiniGameHP, 1, false)) + if (SaveMgr.Ins.Check_Money(eMoney.MiniGameHP, 1, true)) m_Game_Mini.Set(); break; } diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index 8e358bd..448a9d0 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -863,6 +863,7 @@ PlayerSettings: vrEditorSettings: {} cloudServicesEnabled: Purchasing: 0 + Unity Ads: 1 luminIcon: m_Name: m_ModelFolderPath: diff --git a/ProjectSettings/UnityConnectSettings.asset b/ProjectSettings/UnityConnectSettings.asset index 699db18..3db114f 100644 --- a/ProjectSettings/UnityConnectSettings.asset +++ b/ProjectSettings/UnityConnectSettings.asset @@ -25,12 +25,14 @@ UnityConnectSettings: m_InitializeOnStartup: 1 m_PackageRequiringCoreStatsPresent: 0 UnityAdsSettings: - m_Enabled: 0 + m_Enabled: 1 m_InitializeOnStartup: 1 m_TestMode: 0 m_IosGameId: m_AndroidGameId: - m_GameIds: {} - m_GameId: + m_GameIds: + AndroidPlayer: 5947579 + iPhonePlayer: 5947578 + m_GameId: 5947579 PerformanceReportingSettings: m_Enabled: 0