diff --git a/Assets/ResWork/Table/Export/Shop.json b/Assets/ResWork/Table/Export/Shop.json index 0dac176..6f2c58f 100644 --- a/Assets/ResWork/Table/Export/Shop.json +++ b/Assets/ResWork/Table/Export/Shop.json @@ -2,7 +2,7 @@ 채팅 코인 x20", "n_RewardHeart": "40", "n_RewardChatCoin": "20", "n_RewardGacha": "0", "n_BonusGameRefill": "0", "b_AdRemove": "False", "b_InfinityMiniGame": "False", "b_LuckyGameCharge": "False"}, {"s_ID": "package_minigame", "e_InAppInitType": "One1", "e_BuyType": "IAP", "s_Name": "Free 게임 패키지", "n_Price": "9900", "n_Limit": "0", "s_PeakEffective": "", "s_Icon": "shop money icon 2_shop", "s_Items": "보너스 게임 리필 횟수 +1 -수집 게임 무제한 입장", "n_RewardHeart": "0", "n_RewardChatCoin": "0", "n_RewardGacha": "0", "n_BonusGameRefill": "1", "b_AdRemove": "False", "b_InfinityMiniGame": "True", "b_LuckyGameCharge": "False"}, {"s_ID": "package_gacha", "e_InAppInitType": "One2", "e_BuyType": "IAP", "s_Name": "무한 뽑기 패키지", "n_Price": "25000", "n_Limit": "0", "s_PeakEffective": "", "s_Icon": "shop money icon 2_shop", "s_Items": "보너스 게임 +미니 게임 무제한 입장", "n_RewardHeart": "0", "n_RewardChatCoin": "0", "n_RewardGacha": "0", "n_BonusGameRefill": "1", "b_AdRemove": "False", "b_InfinityMiniGame": "True", "b_LuckyGameCharge": "False"}, {"s_ID": "package_gacha", "e_InAppInitType": "One2", "e_BuyType": "IAP", "s_Name": "무한 뽑기 패키지", "n_Price": "25000", "n_Limit": "0", "s_PeakEffective": "", "s_Icon": "shop money icon 2_shop", "s_Items": "보너스 게임 리필 횟수 +1 뽑기 무료 충전 시간 diff --git a/Assets/ResWork/Table/SheGotWet.xlsm b/Assets/ResWork/Table/SheGotWet.xlsm index d570a2e..76cf8bd 100644 Binary files a/Assets/ResWork/Table/SheGotWet.xlsm and b/Assets/ResWork/Table/SheGotWet.xlsm differ diff --git a/Assets/ResWork/UI_Prefab/ProfileCard.prefab b/Assets/ResWork/UI_Prefab/ProfileCard.prefab index d2c3fae..0a55f39 100644 --- a/Assets/ResWork/UI_Prefab/ProfileCard.prefab +++ b/Assets/ResWork/UI_Prefab/ProfileCard.prefab @@ -2056,6 +2056,7 @@ MonoBehaviour: go_openbtn: {fileID: 5762353980434385379} go_viewbtn: {fileID: 4007246598957671079} go_albumbtn: {fileID: 6118212189904897713} + go_chatbtn: {fileID: 6488644166046883144} rect: {fileID: 0} --- !u!1 &8512964498684640329 GameObject: diff --git a/Assets/Scenes/SampleScene.unity b/Assets/Scenes/SampleScene.unity index f5a169b..e82681f 100644 --- a/Assets/Scenes/SampleScene.unity +++ b/Assets/Scenes/SampleScene.unity @@ -60010,7 +60010,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &1793160175 RectTransform: m_ObjectHideFlags: 0 @@ -64078,7 +64078,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: -74} + m_AnchoredPosition: {x: 0, y: -74.000015} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1912645485 @@ -69341,7 +69341,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: -76} + m_AnchoredPosition: {x: 0, y: -75.999985} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &2037068573 diff --git a/Assets/Scripts/AttachToGameObject/SaveMgr.cs b/Assets/Scripts/AttachToGameObject/SaveMgr.cs index 7b02aba..c94594d 100644 --- a/Assets/Scripts/AttachToGameObject/SaveMgr.cs +++ b/Assets/Scripts/AttachToGameObject/SaveMgr.cs @@ -367,6 +367,7 @@ public class SaveMgr : MonoBehaviourSingletonTemplate return true; } public bool GachaChargeTime_Reduce() { return m_SaveData.LuckyGameCharge; } + public bool IsInfinityMiniGame() { return m_SaveData.InfinityMiniGame; } public class SaveData { diff --git a/Assets/Scripts/UI/LobbyUI.cs b/Assets/Scripts/UI/LobbyUI.cs index da61b86..929e9f3 100644 --- a/Assets/Scripts/UI/LobbyUI.cs +++ b/Assets/Scripts/UI/LobbyUI.cs @@ -62,6 +62,12 @@ public class LobbyUI : MonoBehaviourSingletonTemplate break; case "btn_minigame": + if (SaveMgr.Ins.IsInfinityMiniGame()) + { + m_Game_Mini.Set(); + return; + } + if (SaveMgr.Ins.Check_Money(eMoney.MiniGameHP, 1, false)) { SaveMgr.Ins.Add_Money(eMoney.MiniGameHP, -1); diff --git a/Assets/Scripts/UI/ProfileCard.cs b/Assets/Scripts/UI/ProfileCard.cs index 9ec8fbe..7b9eabb 100644 --- a/Assets/Scripts/UI/ProfileCard.cs +++ b/Assets/Scripts/UI/ProfileCard.cs @@ -7,7 +7,7 @@ public class ProfileCard : MonoBehaviour { public Image i_girl, i_openbtn; public TextMeshProUGUI[] texts; // 0 이름, 1 카운트 - public GameObject go_lock, go_openbtn, go_viewbtn, go_albumbtn; + public GameObject go_lock, go_openbtn, go_viewbtn, go_albumbtn, go_chatbtn; public RectTransform rect; girltabledata m_Data; @@ -48,6 +48,8 @@ public class ProfileCard : MonoBehaviour i_openbtn.sprite = UIAtlasMgr.Ins.Get_Sprite(CanOpen() ? "red btn long" : "black btn"); go_viewbtn.SetActive(count == 0); go_albumbtn.SetActive(count > 0); + //go_chatbtn.SetActive(count > 0); + go_chatbtn.SetActive(false); // 게등위 테스트 } bool CanOpen() diff --git a/Assets/Scripts/UI/ShopCard.cs b/Assets/Scripts/UI/ShopCard.cs index 1d01f44..5304a5e 100644 --- a/Assets/Scripts/UI/ShopCard.cs +++ b/Assets/Scripts/UI/ShopCard.cs @@ -248,7 +248,7 @@ public class ShopCard : MonoBehaviour if (m_Data.b_InfinityMiniGame) { if (!string.IsNullOrEmpty(msg)) msg += "\n"; - msg += $"수집 게임 무제한 입장을 획득했습니다."; + msg += $"미니 게임 무제한 입장을 획득했습니다."; } if (m_Data.b_LuckyGameCharge)