"1. 미니게임 입장 기회가 없을 때는 버튼을 회색으로 변경 부탁드립니다.
2. 소수점은 1자리까지만 표기해도 될 것 같습니다. (※뽑기 UI에도 동일) 3. 미니게임 입장 기회가 없을 때 버튼 누르면 ""하트가 부족합니다."" 라는 토스트 메시지 출력 부탁드립니다. 4. 뽑기 메뉴에서 뽑기 재화가 부족할 때에도 버튼을 회색으로 나오게 처리 부탁드립니다."
This commit is contained in:
parent
bd2a774901
commit
ce5a3cffe7
|
|
@ -160,7 +160,8 @@ TextureImporter:
|
||||||
secondaryTextures: []
|
secondaryTextures: []
|
||||||
spriteCustomMetadata:
|
spriteCustomMetadata:
|
||||||
entries: []
|
entries: []
|
||||||
nameFileIdTable: {}
|
nameFileIdTable:
|
||||||
|
MiniGameGray_btn_0: 7978507074057238709
|
||||||
mipmapLimitGroupName:
|
mipmapLimitGroupName:
|
||||||
pSDRemoveMatte: 0
|
pSDRemoveMatte: 0
|
||||||
userData:
|
userData:
|
||||||
|
|
|
||||||
|
|
@ -38521,7 +38521,7 @@ MonoBehaviour:
|
||||||
m_OnCullStateChanged:
|
m_OnCullStateChanged:
|
||||||
m_PersistentCalls:
|
m_PersistentCalls:
|
||||||
m_Calls: []
|
m_Calls: []
|
||||||
m_Sprite: {fileID: 21300000, guid: 97c84f1ff60498c439a184ed0e0acbec, type: 3}
|
m_Sprite: {fileID: 21300000, guid: ffedcc4b1712a7d47aef8352f6ab21cf, type: 3}
|
||||||
m_Type: 0
|
m_Type: 0
|
||||||
m_PreserveAspect: 0
|
m_PreserveAspect: 0
|
||||||
m_FillCenter: 1
|
m_FillCenter: 1
|
||||||
|
|
@ -67230,6 +67230,7 @@ MonoBehaviour:
|
||||||
- {fileID: 2057533035}
|
- {fileID: 2057533035}
|
||||||
- {fileID: 1227751126}
|
- {fileID: 1227751126}
|
||||||
go_minigamechargingbtn: {fileID: 2079832695}
|
go_minigamechargingbtn: {fileID: 2079832695}
|
||||||
|
i_minigamechargingbtn: {fileID: 2079832699}
|
||||||
slider_minigamecharging: {fileID: 404172103}
|
slider_minigamecharging: {fileID: 404172103}
|
||||||
t_minigamechargingtime: {fileID: 644731195}
|
t_minigamechargingtime: {fileID: 644731195}
|
||||||
m_AttandanceUI: {fileID: 388368217}
|
m_AttandanceUI: {fileID: 388368217}
|
||||||
|
|
|
||||||
|
|
@ -181,12 +181,14 @@ public class SaveMgr : MonoBehaviourSingletonTemplate<SaveMgr>
|
||||||
LobbyUI.Ins.m_ToastUI.Set("채팅 코인이 부족합니다.", toasty);
|
LobbyUI.Ins.m_ToastUI.Set("채팅 코인이 부족합니다.", toasty);
|
||||||
break;
|
break;
|
||||||
case eMoney.Gacha:
|
case eMoney.Gacha:
|
||||||
LobbyUI.Ins.m_ToastUI.Set("뽑기 재화가 부족합니다.", toasty);
|
LobbyUI.Ins.m_ToastUI.Set("별 코인이 부족합니다.", toasty);
|
||||||
break;
|
break;
|
||||||
case eMoney.Lucky:
|
case eMoney.Lucky:
|
||||||
LobbyUI.Ins.m_ToastUI.Set("럭키 포인트가 부족합니다.", toasty);
|
LobbyUI.Ins.m_ToastUI.Set("럭키 포인트가 부족합니다.", toasty);
|
||||||
break;
|
break;
|
||||||
case eMoney.MiniGameHP:
|
case eMoney.MiniGameHP:
|
||||||
|
LobbyUI.Ins.m_ToastUI.Set("생명력이 부족합니다.", toasty);
|
||||||
|
break;
|
||||||
case eMoney.ItemBomb:
|
case eMoney.ItemBomb:
|
||||||
case eMoney.ItemUmbrella:
|
case eMoney.ItemUmbrella:
|
||||||
case eMoney.ItemDildo:
|
case eMoney.ItemDildo:
|
||||||
|
|
|
||||||
|
|
@ -38,7 +38,7 @@ public class GachaUI : uScrollViewMgr
|
||||||
var cal = GachaAutoRefillTime - InternetTime.Ins.Time;
|
var cal = GachaAutoRefillTime - InternetTime.Ins.Time;
|
||||||
fRefillTime -= Time.deltaTime;
|
fRefillTime -= Time.deltaTime;
|
||||||
if (cal.TotalSeconds <= 0) fRefillTime = 0f;
|
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");
|
var fRefillTimeMax = table_GlobalValue.Ins.Get_Float("GachaAutoRefill_DelayTime");
|
||||||
if (SaveMgr.Ins.GachaChargeTime_Reduce()) fRefillTimeMax -= fRefillTimeMax * 0.9f;
|
if (SaveMgr.Ins.GachaChargeTime_Reduce()) fRefillTimeMax -= fRefillTimeMax * 0.9f;
|
||||||
slider_charge.value = DSUtil.Get_SliderValue(fRefillTime / fRefillTimeMax);
|
slider_charge.value = DSUtil.Get_SliderValue(fRefillTime / fRefillTimeMax);
|
||||||
|
|
|
||||||
|
|
@ -7,6 +7,7 @@ public class LobbyUI : MonoBehaviourSingletonTemplate<LobbyUI>
|
||||||
{
|
{
|
||||||
[SerializeField] TextMeshProUGUI[] texts_money; // 0 앨범 개방 재화, 1 채팅 재화, 2 뽑기 재화, 3 4 미니게임 체력
|
[SerializeField] TextMeshProUGUI[] texts_money; // 0 앨범 개방 재화, 1 채팅 재화, 2 뽑기 재화, 3 4 미니게임 체력
|
||||||
public GameObject go_minigamechargingbtn;
|
public GameObject go_minigamechargingbtn;
|
||||||
|
public Image i_minigamechargingbtn;
|
||||||
public Slider slider_minigamecharging;
|
public Slider slider_minigamecharging;
|
||||||
public TextMeshProUGUI t_minigamechargingtime;
|
public TextMeshProUGUI t_minigamechargingtime;
|
||||||
float minigamechargingTime = 0f;
|
float minigamechargingTime = 0f;
|
||||||
|
|
@ -49,6 +50,7 @@ public class LobbyUI : MonoBehaviourSingletonTemplate<LobbyUI>
|
||||||
minigamechargingTime = (float)(SaveMgr.Ins.Get_MiniGameTime() - InternetTime.Ins.Time).TotalMilliseconds * 0.001f;
|
minigamechargingTime = (float)(SaveMgr.Ins.Get_MiniGameTime() - InternetTime.Ins.Time).TotalMilliseconds * 0.001f;
|
||||||
go_minigamechargingbtn.SetActive(minigamechargingTime > 0f);
|
go_minigamechargingbtn.SetActive(minigamechargingTime > 0f);
|
||||||
if (minigamechargingTime <= 0f) Check_MiniGameCharging();
|
if (minigamechargingTime <= 0f) Check_MiniGameCharging();
|
||||||
|
Set_i_minigamechargingbtn();
|
||||||
|
|
||||||
bUpdate = true;
|
bUpdate = true;
|
||||||
}
|
}
|
||||||
|
|
@ -62,7 +64,7 @@ public class LobbyUI : MonoBehaviourSingletonTemplate<LobbyUI>
|
||||||
if (!SaveMgr.Ins.Check_Money(eMoney.MiniGameHP, table_GlobalValue.Ins.Get_Int("MiniGame_TotalEnterMoney"), false))
|
if (!SaveMgr.Ins.Check_Money(eMoney.MiniGameHP, table_GlobalValue.Ins.Get_Int("MiniGame_TotalEnterMoney"), false))
|
||||||
{
|
{
|
||||||
minigamechargingTime -= Time.deltaTime;
|
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");
|
var fRefillTimeMax = table_GlobalValue.Ins.Get_Float("MiniGame_EnterMoney_Time");
|
||||||
slider_minigamecharging.value = DSUtil.Get_SliderValue(minigamechargingTime / fRefillTimeMax);
|
slider_minigamecharging.value = DSUtil.Get_SliderValue(minigamechargingTime / fRefillTimeMax);
|
||||||
|
|
||||||
|
|
@ -73,7 +75,7 @@ public class LobbyUI : MonoBehaviourSingletonTemplate<LobbyUI>
|
||||||
void MiniGameCharging()
|
void MiniGameCharging()
|
||||||
{
|
{
|
||||||
SaveMgr.Ins.Add_Money(eMoney.MiniGameHP);
|
SaveMgr.Ins.Add_Money(eMoney.MiniGameHP);
|
||||||
m_ToastUI.Set($"미니게임 체력이 충전되었습니다.");
|
m_ToastUI.Set($"생명력이 충전되었습니다.");
|
||||||
Check_MiniGameCharging();
|
Check_MiniGameCharging();
|
||||||
Set_Money();
|
Set_Money();
|
||||||
SaveMgr.Ins.Save();
|
SaveMgr.Ins.Save();
|
||||||
|
|
@ -91,6 +93,14 @@ public class LobbyUI : MonoBehaviourSingletonTemplate<LobbyUI>
|
||||||
}
|
}
|
||||||
|
|
||||||
if (CurMenu == 2) go_minigamechargingbtn.SetActive(minigamechargingTime > 0f);
|
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)
|
public void OnClick_Button(GameObject btn)
|
||||||
|
|
@ -155,7 +165,7 @@ public class LobbyUI : MonoBehaviourSingletonTemplate<LobbyUI>
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (SaveMgr.Ins.Check_Money(eMoney.MiniGameHP, 1, false))
|
if (SaveMgr.Ins.Check_Money(eMoney.MiniGameHP, 1, true))
|
||||||
m_Game_Mini.Set();
|
m_Game_Mini.Set();
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -863,6 +863,7 @@ PlayerSettings:
|
||||||
vrEditorSettings: {}
|
vrEditorSettings: {}
|
||||||
cloudServicesEnabled:
|
cloudServicesEnabled:
|
||||||
Purchasing: 0
|
Purchasing: 0
|
||||||
|
Unity Ads: 1
|
||||||
luminIcon:
|
luminIcon:
|
||||||
m_Name:
|
m_Name:
|
||||||
m_ModelFolderPath:
|
m_ModelFolderPath:
|
||||||
|
|
|
||||||
|
|
@ -25,12 +25,14 @@ UnityConnectSettings:
|
||||||
m_InitializeOnStartup: 1
|
m_InitializeOnStartup: 1
|
||||||
m_PackageRequiringCoreStatsPresent: 0
|
m_PackageRequiringCoreStatsPresent: 0
|
||||||
UnityAdsSettings:
|
UnityAdsSettings:
|
||||||
m_Enabled: 0
|
m_Enabled: 1
|
||||||
m_InitializeOnStartup: 1
|
m_InitializeOnStartup: 1
|
||||||
m_TestMode: 0
|
m_TestMode: 0
|
||||||
m_IosGameId:
|
m_IosGameId:
|
||||||
m_AndroidGameId:
|
m_AndroidGameId:
|
||||||
m_GameIds: {}
|
m_GameIds:
|
||||||
m_GameId:
|
AndroidPlayer: 5947579
|
||||||
|
iPhonePlayer: 5947578
|
||||||
|
m_GameId: 5947579
|
||||||
PerformanceReportingSettings:
|
PerformanceReportingSettings:
|
||||||
m_Enabled: 0
|
m_Enabled: 0
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue