미니게임 진행으로 미니게임 입장 횟수를 모두 소진한 경우, 로비 화면의 재화 수량 정보가 버튼 뒤로 보이고 있습니다

This commit is contained in:
Ino 2025-11-07 12:42:23 +09:00
parent 15ded8b580
commit 4b8a1b2394
2 changed files with 309 additions and 12 deletions

View File

@ -47078,6 +47078,142 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1227023956} m_GameObject: {fileID: 1227023956}
m_CullTransparentMesh: 1 m_CullTransparentMesh: 1
--- !u!1 &1227751123
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1227751124}
- component: {fileID: 1227751125}
- component: {fileID: 1227751126}
m_Layer: 5
m_Name: t_hp
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &1227751124
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1227751123}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 1944571997}
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: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1227751125
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1227751123}
m_CullTransparentMesh: 1
--- !u!114 &1227751126
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1227751123}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 0
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_text: 5
m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: 3055b5c28f94e6c4ea6b9a379bb315a5, type: 2}
m_sharedMaterial: {fileID: 2100000, guid: f0e824099790d3445af94a5b86b5cc4a, type: 2}
m_fontSharedMaterials: []
m_fontMaterial: {fileID: 0}
m_fontMaterials: []
m_fontColor32:
serializedVersion: 2
rgba: 4294967295
m_fontColor: {r: 1, g: 1, b: 1, a: 1}
m_enableVertexGradient: 0
m_colorMode: 3
m_fontColorGradient:
topLeft: {r: 1, g: 1, b: 1, a: 1}
topRight: {r: 1, g: 1, b: 1, a: 1}
bottomLeft: {r: 1, g: 1, b: 1, a: 1}
bottomRight: {r: 1, g: 1, b: 1, a: 1}
m_fontColorGradientPreset: {fileID: 0}
m_spriteAsset: {fileID: 0}
m_tintAllSprites: 0
m_StyleSheet: {fileID: 0}
m_TextStyleHashCode: -1183493901
m_overrideHtmlColors: 0
m_faceColor:
serializedVersion: 2
rgba: 4294967295
m_fontSize: 40
m_fontSizeBase: 40
m_fontWeight: 400
m_enableAutoSizing: 0
m_fontSizeMin: 20
m_fontSizeMax: 80
m_fontStyle: 0
m_HorizontalAlignment: 2
m_VerticalAlignment: 4096
m_textAlignment: 65535
m_characterSpacing: 0
m_wordSpacing: 0
m_lineSpacing: 0
m_lineSpacingMax: 0
m_paragraphSpacing: 0
m_charWidthMaxAdj: 0
m_TextWrappingMode: 1
m_wordWrappingRatios: 0.4
m_overflowMode: 0
m_linkedTextComponent: {fileID: 0}
parentLinkedComponent: {fileID: 0}
m_enableKerning: 0
m_ActiveFontFeatures: 6e72656b
m_enableExtraPadding: 0
checkPaddingRequired: 0
m_isRichText: 1
m_EmojiFallbackSupport: 1
m_parseCtrlCharacters: 1
m_isOrthographic: 1
m_isCullingEnabled: 0
m_horizontalMapping: 0
m_verticalMapping: 0
m_uvLineOffset: 0
m_geometrySortingOrder: 0
m_IsTextObjectScaleStatic: 0
m_VertexBufferAutoSizeReduction: 0
m_useMaxVisibleDescender: 1
m_pageToDisplay: 1
m_margin: {x: 0, y: 0, z: 0, w: 0}
m_isUsingLegacyAnimationComponent: 0
m_isVolumetricText: 0
m_hasFontAssetChanged: 0
m_baseMaterial: {fileID: 0}
m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
--- !u!1 &1228242629 --- !u!1 &1228242629
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -67074,6 +67210,7 @@ MonoBehaviour:
- {fileID: 1301406509} - {fileID: 1301406509}
- {fileID: 278813020} - {fileID: 278813020}
- {fileID: 2057533035} - {fileID: 2057533035}
- {fileID: 1227751126}
gos_minigame: gos_minigame:
- {fileID: 168358557} - {fileID: 168358557}
- {fileID: 2079832695} - {fileID: 2079832695}
@ -67092,6 +67229,7 @@ MonoBehaviour:
gos_homeBot: gos_homeBot:
- {fileID: 1918801480} - {fileID: 1918801480}
- {fileID: 168358557} - {fileID: 168358557}
- {fileID: 2079832695}
m_Game_Lucky: {fileID: 1257193657} m_Game_Lucky: {fileID: 1257193657}
m_Game_Mini: {fileID: 2007599845} m_Game_Mini: {fileID: 2007599845}
go_shop: {fileID: 1629576850} go_shop: {fileID: 1629576850}
@ -68229,6 +68367,82 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1735735192} m_GameObject: {fileID: 1735735192}
m_CullTransparentMesh: 1 m_CullTransparentMesh: 1
--- !u!1 &1736540431
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1736540432}
- component: {fileID: 1736540434}
- component: {fileID: 1736540433}
m_Layer: 5
m_Name: minigameHP
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &1736540432
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1736540431}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 1944571997}
m_Father: {fileID: 2079832696}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: -107.000046, y: 61.99994}
m_SizeDelta: {x: 250, y: 80}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1736540433
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1736540431}
m_Enabled: 0
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 0.21960786, g: 0.21960786, b: 0.21960786, a: 1}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 21300000, guid: b0a7567624709ee45872c0e655845f2d, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
m_FillMethod: 4
m_FillAmount: 1
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1
--- !u!222 &1736540434
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1736540431}
m_CullTransparentMesh: 1
--- !u!1 &1738221189 --- !u!1 &1738221189
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -71130,7 +71344,7 @@ RectTransform:
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1793160174} m_GameObject: {fileID: 1793160174}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0 m_ConstrainProportionsScale: 0
@ -71140,7 +71354,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: -107, y: 62} m_AnchoredPosition: {x: -107.000046, y: 61.99994}
m_SizeDelta: {x: 250, y: 80} m_SizeDelta: {x: 250, y: 80}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1793160176 --- !u!114 &1793160176
@ -77382,6 +77596,82 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1941958623} m_GameObject: {fileID: 1941958623}
m_CullTransparentMesh: 1 m_CullTransparentMesh: 1
--- !u!1 &1944571996
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1944571997}
- component: {fileID: 1944571999}
- component: {fileID: 1944571998}
m_Layer: 5
m_Name: New Image
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &1944571997
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1944571996}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 1227751124}
m_Father: {fileID: 1736540432}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0.5}
m_AnchorMax: {x: 0, y: 0.5}
m_AnchoredPosition: {x: 50, y: 0}
m_SizeDelta: {x: 78, y: 69}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1944571998
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1944571996}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 0
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 21300000, guid: d0f7f3f138ee2014ca1b02018b24b2ea, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
m_FillMethod: 4
m_FillAmount: 1
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1
--- !u!222 &1944571999
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1944571996}
m_CullTransparentMesh: 1
--- !u!1 &1947183316 --- !u!1 &1947183316
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -82732,6 +83022,7 @@ RectTransform:
- {fileID: 2029306902} - {fileID: 2029306902}
- {fileID: 209045377} - {fileID: 209045377}
- {fileID: 404172102} - {fileID: 404172102}
- {fileID: 1736540432}
m_Father: {fileID: 1679508532} m_Father: {fileID: 1679508532}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 1} m_AnchorMin: {x: 0.5, y: 1}

View File

@ -5,7 +5,7 @@ using UnityEngine.UI;
public class LobbyUI : MonoBehaviourSingletonTemplate<LobbyUI> public class LobbyUI : MonoBehaviourSingletonTemplate<LobbyUI>
{ {
[SerializeField] TextMeshProUGUI[] texts_money; // 0 앨범 개방 재화, 1 채팅 재화, 2 뽑기 재화, 3 미니게임 체력 [SerializeField] TextMeshProUGUI[] texts_money; // 0 앨범 개방 재화, 1 채팅 재화, 2 뽑기 재화, 3 4 미니게임 체력
public GameObject[] gos_minigame; // 0 입장, 1 차징 public GameObject[] gos_minigame; // 0 입장, 1 차징
public Slider slider_minigamecharging; public Slider slider_minigamecharging;
public TextMeshProUGUI t_minigamechargingtime; public TextMeshProUGUI t_minigamechargingtime;
@ -66,16 +66,21 @@ public class LobbyUI : MonoBehaviourSingletonTemplate<LobbyUI>
slider_minigamecharging.value = DSUtil.Get_SliderValue(minigamechargingTime / fRefillTimeMax); slider_minigamecharging.value = DSUtil.Get_SliderValue(minigamechargingTime / fRefillTimeMax);
if (cal.TotalSeconds <= 0 && minigamechargingTime <= 0f) if (cal.TotalSeconds <= 0 && minigamechargingTime <= 0f)
MiniGameAllCharging();
}
else if (!SaveMgr.Ins.Check_Money(eMoney.MiniGameHP, 1, false))
MiniGameAllCharging();
}
void MiniGameAllCharging()
{ {
SaveMgr.Ins.Set_Money(eMoney.MiniGameHP, table_GlobalValue.Ins.Get_Int("MiniGame_TotalEnterMoney")); SaveMgr.Ins.Set_Money(eMoney.MiniGameHP, table_GlobalValue.Ins.Get_Int("MiniGame_TotalEnterMoney"));
SaveMgr.Ins.Save(); SaveMgr.Ins.Save();
m_ToastUI.Set($"미니게임 체력이 모두 충전되었습니다."); m_ToastUI.Set($"미니게임 체력이 모두 충전되었습니다.");
if (CurMenu == 2)
DSUtil.InActivateGameObjects(gos_minigame, minigamechargingTime > 0f ? 1 : 0); DSUtil.InActivateGameObjects(gos_minigame, minigamechargingTime > 0f ? 1 : 0);
Set_Money(); Set_Money();
} }
}
}
public void OnClick_Button(GameObject btn) public void OnClick_Button(GameObject btn)
{ {
@ -171,6 +176,7 @@ public class LobbyUI : MonoBehaviourSingletonTemplate<LobbyUI>
m_GachaUI.gameObject.SetActive(false); m_GachaUI.gameObject.SetActive(false);
go_shop.SetActive(false); go_shop.SetActive(false);
DSUtil.ActivateGameObjects(gos_homeBot); DSUtil.ActivateGameObjects(gos_homeBot);
DSUtil.InActivateGameObjects(gos_minigame, minigamechargingTime > 0f ? 1 : 0);
} }
public void Go_Album(int girlid) public void Go_Album(int girlid)
@ -186,7 +192,7 @@ public class LobbyUI : MonoBehaviourSingletonTemplate<LobbyUI>
texts_money[1].text = SaveMgr.Ins.Get_Money(eMoney.Chat).ToString(); texts_money[1].text = SaveMgr.Ins.Get_Money(eMoney.Chat).ToString();
texts_money[2].text = SaveMgr.Ins.Get_Money(eMoney.Gacha).ToString(); texts_money[2].text = SaveMgr.Ins.Get_Money(eMoney.Gacha).ToString();
//if (SaveMgr.Ins.Get_Money(eMoney.MiniGameHP) > 0) //if (SaveMgr.Ins.Get_Money(eMoney.MiniGameHP) > 0)
texts_money[3].text = SaveMgr.Ins.Get_Money(eMoney.MiniGameHP).ToString(); texts_money[3].text = texts_money[4].text = SaveMgr.Ins.Get_Money(eMoney.MiniGameHP).ToString();
} }
public void Show_Profile(int girlid) public void Show_Profile(int girlid)