mcutegs2/M-Gameton-06
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

feat: 생선 부족시 사용 경고 알림 팝업 출력

Browse Source
This commit is contained in:
aube.lee
2025-02-28 15:32:48 +09:00
parent 6f69f9a9d7
commit fb4c214162
9 changed files with 327 additions and 156 deletions
Download Patch File Download Diff File Expand all files Collapse all files

151
Gameton-06/Assets/Gameton/Resources/UI/Prefabs/Popup/UI.FishPopup.prefab
View File

@@ -1,6 +1,6 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1 &7501653422388961225
--- !u!1 &1793846211474527041
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
@@ -8,114 +8,35 @@ GameObject:
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 346411102141481488}
- component: {fileID: 5773543649959266945}
- component: {fileID: 6822762825204874979}
- component: {fileID: 4204961286287429386}
- component: {fileID: 6715598346025357726}
m_Layer: 5
- component: {fileID: 7619827470732011535}
m_Layer: 0
m_Name: UI.FishPopup
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &346411102141481488
--- !u!224 &7619827470732011535
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7501653422388961225}
m_GameObject: {fileID: 1793846211474527041}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 2276556061955991946}
- {fileID: 2511591562875614874}
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {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, y: 0}
--- !u!223 &5773543649959266945
Canvas:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7501653422388961225}
m_Enabled: 1
serializedVersion: 3
m_RenderMode: 0
m_Camera: {fileID: 0}
m_PlaneDistance: 100
m_PixelPerfect: 0
m_ReceivesEvents: 1
m_OverrideSorting: 0
m_OverridePixelPerfect: 0
m_SortingBucketNormalizedSize: 0
m_VertexColorAlwaysGammaSpace: 0
m_AdditionalShaderChannelsFlag: 25
m_UpdateRectTransformForStandalone: 0
m_SortingLayerID: 0
m_SortingOrder: 0
m_TargetDisplay: 0
--- !u!114 &6822762825204874979
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7501653422388961225}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3}
m_Name:
m_EditorClassIdentifier:
m_UiScaleMode: 1
m_ReferencePixelsPerUnit: 100
m_ScaleFactor: 1
m_ReferenceResolution: {x: 1920, y: 1080}
m_ScreenMatchMode: 0
m_MatchWidthOrHeight: 0
m_PhysicalUnit: 3
m_FallbackScreenDPI: 96
m_DefaultSpriteDPI: 96
m_DynamicPixelsPerUnit: 1
m_PresetInfoIsWorld: 0
--- !u!114 &4204961286287429386
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7501653422388961225}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3}
m_Name:
m_EditorClassIdentifier:
m_IgnoreReversedGraphics: 1
m_BlockingObjects: 0
m_BlockingMask:
serializedVersion: 2
m_Bits: 575
--- !u!114 &6715598346025357726
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7501653422388961225}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 2e8e4ece5f5d84f43a51d6804fb38019, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!1 &8358676747079846840
m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &2289321313500956691
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
@@ -123,50 +44,50 @@ GameObject:
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 569840923757673222}
- component: {fileID: 260118700752151956}
- component: {fileID: 4734009378839466249}
m_Layer: 5
- component: {fileID: 3832173502456449029}
- component: {fileID: 6350442636702935269}
- component: {fileID: 1153324492894163565}
m_Layer: 0
m_Name: Text (TMP)
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &569840923757673222
--- !u!224 &3832173502456449029
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8358676747079846840}
m_GameObject: {fileID: 2289321313500956691}
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: 2276556061955991946}
m_Father: {fileID: 2511591562875614874}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0.5}
m_AnchorMax: {x: 1, y: 0.5}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 50}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &260118700752151956
--- !u!222 &6350442636702935269
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8358676747079846840}
m_GameObject: {fileID: 2289321313500956691}
m_CullTransparentMesh: 1
--- !u!114 &4734009378839466249
--- !u!114 &1153324492894163565
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8358676747079846840}
m_GameObject: {fileID: 2289321313500956691}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3}
@@ -207,8 +128,8 @@ MonoBehaviour:
m_faceColor:
serializedVersion: 2
rgba: 4294967295
m_fontSize: 50
m_fontSizeBase: 50
m_fontSize: 48
m_fontSizeBase: 48
m_fontWeight: 400
m_enableAutoSizing: 0
m_fontSizeMin: 18
@@ -249,7 +170,7 @@ MonoBehaviour:
m_hasFontAssetChanged: 0
m_baseMaterial: {fileID: 0}
m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
--- !u!1 &8642651441457959178
--- !u!1 &4006742225778983270
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
@@ -257,51 +178,51 @@ GameObject:
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 2276556061955991946}
- component: {fileID: 5317174918752086168}
- component: {fileID: 6989342207599455832}
m_Layer: 5
- component: {fileID: 2511591562875614874}
- component: {fileID: 2077317848617336260}
- component: {fileID: 3575240707709088277}
m_Layer: 0
m_Name: Label
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &2276556061955991946
--- !u!224 &2511591562875614874
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8642651441457959178}
m_GameObject: {fileID: 4006742225778983270}
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: 569840923757673222}
m_Father: {fileID: 346411102141481488}
- {fileID: 3832173502456449029}
m_Father: {fileID: 7619827470732011535}
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: 0, y: 0}
m_SizeDelta: {x: 500, y: 100}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5317174918752086168
--- !u!222 &2077317848617336260
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8642651441457959178}
m_GameObject: {fileID: 4006742225778983270}
m_CullTransparentMesh: 1
--- !u!114 &6989342207599455832
--- !u!114 &3575240707709088277
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8642651441457959178}
m_GameObject: {fileID: 4006742225778983270}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}

109
Gameton-06/Assets/Gameton/Resources/UI/Prefabs/UI.GameWinUI.prefab
View File

@@ -1978,6 +1978,7 @@ RectTransform:
- {fileID: 8309246643985150052}
- {fileID: 4381857254374141117}
- {fileID: 2521041396983871113}
- {fileID: 4459542549437555570}
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
@@ -2100,6 +2101,7 @@ MonoBehaviour:
m_EditorClassIdentifier:
rechargeModal: {fileID: 3404085104768005771}
retryModal: {fileID: 3534850040710458559}
fishPopup: {fileID: 5528572358339008572}
title: {fileID: 3072291578172711816}
goldReward: {fileID: 2511594787156804949}
expReward: {fileID: 3421040063749252687}
@@ -3598,6 +3600,113 @@ GameObject:
m_CorrespondingSourceObject: {fileID: 8497571519533246670, guid: 3f28b0f5c3b932d43a67aa4a7e70a1a6, type: 3}
m_PrefabInstance: {fileID: 4963880639512380529}
m_PrefabAsset: {fileID: 0}
--- !u!1001 &6078851127301475197
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
serializedVersion: 3
m_TransformParent: {fileID: 1781236700806201943}
m_Modifications:
- target: {fileID: 1793846211474527041, guid: 087b80cc5e15a874bba75f8c15df434f, type: 3}
propertyPath: m_Name
value: UI.FishPopup
objectReference: {fileID: 0}
- target: {fileID: 7619827470732011535, guid: 087b80cc5e15a874bba75f8c15df434f, type: 3}
propertyPath: m_Pivot.x
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 7619827470732011535, guid: 087b80cc5e15a874bba75f8c15df434f, type: 3}
propertyPath: m_Pivot.y
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 7619827470732011535, guid: 087b80cc5e15a874bba75f8c15df434f, type: 3}
propertyPath: m_AnchorMax.x
value: 1
objectReference: {fileID: 0}
- target: {fileID: 7619827470732011535, guid: 087b80cc5e15a874bba75f8c15df434f, type: 3}
propertyPath: m_AnchorMax.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 7619827470732011535, guid: 087b80cc5e15a874bba75f8c15df434f, type: 3}
propertyPath: m_AnchorMin.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7619827470732011535, guid: 087b80cc5e15a874bba75f8c15df434f, type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7619827470732011535, guid: 087b80cc5e15a874bba75f8c15df434f, type: 3}
propertyPath: m_SizeDelta.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7619827470732011535, guid: 087b80cc5e15a874bba75f8c15df434f, type: 3}
propertyPath: m_SizeDelta.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7619827470732011535, guid: 087b80cc5e15a874bba75f8c15df434f, type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7619827470732011535, guid: 087b80cc5e15a874bba75f8c15df434f, type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7619827470732011535, guid: 087b80cc5e15a874bba75f8c15df434f, type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7619827470732011535, guid: 087b80cc5e15a874bba75f8c15df434f, type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 7619827470732011535, guid: 087b80cc5e15a874bba75f8c15df434f, type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7619827470732011535, guid: 087b80cc5e15a874bba75f8c15df434f, type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7619827470732011535, guid: 087b80cc5e15a874bba75f8c15df434f, type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7619827470732011535, guid: 087b80cc5e15a874bba75f8c15df434f, type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7619827470732011535, guid: 087b80cc5e15a874bba75f8c15df434f, type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7619827470732011535, guid: 087b80cc5e15a874bba75f8c15df434f, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7619827470732011535, guid: 087b80cc5e15a874bba75f8c15df434f, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7619827470732011535, guid: 087b80cc5e15a874bba75f8c15df434f, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 087b80cc5e15a874bba75f8c15df434f, type: 3}
--- !u!224 &4459542549437555570 stripped
RectTransform:
m_CorrespondingSourceObject: {fileID: 7619827470732011535, guid: 087b80cc5e15a874bba75f8c15df434f, type: 3}
m_PrefabInstance: {fileID: 6078851127301475197}
m_PrefabAsset: {fileID: 0}
--- !u!1 &5528572358339008572 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 1793846211474527041, guid: 087b80cc5e15a874bba75f8c15df434f, type: 3}
m_PrefabInstance: {fileID: 6078851127301475197}
m_PrefabAsset: {fileID: 0}
--- !u!1001 &7557648848435222278
PrefabInstance:
m_ObjectHideFlags: 0

109
Gameton-06/Assets/Gameton/Resources/UI/Prefabs/UI.PauseUI.prefab
View File

@@ -360,6 +360,7 @@ RectTransform:
- {fileID: 8659056901785831664}
- {fileID: 2972897344498405378}
- {fileID: 3368458914398238061}
- {fileID: 172706481160907446}
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
@@ -483,6 +484,7 @@ MonoBehaviour:
rechargeModal: {fileID: 7771489983218815686}
retryModal: {fileID: 4229756133991172660}
homeModal: {fileID: 8282294648677720172}
fishPopup: {fileID: 8304504361353007608}
fishAmount: {fileID: 8148119050712833008}
--- !u!1001 &313243043635125493
PrefabInstance:
@@ -1868,3 +1870,110 @@ RectTransform:
m_CorrespondingSourceObject: {fileID: 3240794480833331071, guid: f4a016815da869a4dad6d8dc7e8aab79, type: 3}
m_PrefabInstance: {fileID: 6112153489407424399}
m_PrefabAsset: {fileID: 0}
--- !u!1001 &7771668244586185401
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
serializedVersion: 3
m_TransformParent: {fileID: 5830140097779826096}
m_Modifications:
- target: {fileID: 1793846211474527041, guid: 087b80cc5e15a874bba75f8c15df434f, type: 3}
propertyPath: m_Name
value: UI.FishPopup
objectReference: {fileID: 0}
- target: {fileID: 7619827470732011535, guid: 087b80cc5e15a874bba75f8c15df434f, type: 3}
propertyPath: m_Pivot.x
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 7619827470732011535, guid: 087b80cc5e15a874bba75f8c15df434f, type: 3}
propertyPath: m_Pivot.y
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 7619827470732011535, guid: 087b80cc5e15a874bba75f8c15df434f, type: 3}
propertyPath: m_AnchorMax.x
value: 1
objectReference: {fileID: 0}
- target: {fileID: 7619827470732011535, guid: 087b80cc5e15a874bba75f8c15df434f, type: 3}
propertyPath: m_AnchorMax.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 7619827470732011535, guid: 087b80cc5e15a874bba75f8c15df434f, type: 3}
propertyPath: m_AnchorMin.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7619827470732011535, guid: 087b80cc5e15a874bba75f8c15df434f, type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7619827470732011535, guid: 087b80cc5e15a874bba75f8c15df434f, type: 3}
propertyPath: m_SizeDelta.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7619827470732011535, guid: 087b80cc5e15a874bba75f8c15df434f, type: 3}
propertyPath: m_SizeDelta.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7619827470732011535, guid: 087b80cc5e15a874bba75f8c15df434f, type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7619827470732011535, guid: 087b80cc5e15a874bba75f8c15df434f, type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7619827470732011535, guid: 087b80cc5e15a874bba75f8c15df434f, type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7619827470732011535, guid: 087b80cc5e15a874bba75f8c15df434f, type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 7619827470732011535, guid: 087b80cc5e15a874bba75f8c15df434f, type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7619827470732011535, guid: 087b80cc5e15a874bba75f8c15df434f, type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7619827470732011535, guid: 087b80cc5e15a874bba75f8c15df434f, type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7619827470732011535, guid: 087b80cc5e15a874bba75f8c15df434f, type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7619827470732011535, guid: 087b80cc5e15a874bba75f8c15df434f, type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7619827470732011535, guid: 087b80cc5e15a874bba75f8c15df434f, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7619827470732011535, guid: 087b80cc5e15a874bba75f8c15df434f, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7619827470732011535, guid: 087b80cc5e15a874bba75f8c15df434f, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 087b80cc5e15a874bba75f8c15df434f, type: 3}
--- !u!224 &172706481160907446 stripped
RectTransform:
m_CorrespondingSourceObject: {fileID: 7619827470732011535, guid: 087b80cc5e15a874bba75f8c15df434f, type: 3}
m_PrefabInstance: {fileID: 7771668244586185401}
m_PrefabAsset: {fileID: 0}
--- !u!1 &8304504361353007608 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 1793846211474527041, guid: 087b80cc5e15a874bba75f8c15df434f, type: 3}
m_PrefabInstance: {fileID: 7771668244586185401}
m_PrefabAsset: {fileID: 0}

1
Gameton-06/Assets/Gameton/Scripts/Common/UIList.cs
View File

@@ -32,7 +32,6 @@ namespace TON
PauseUI, // 일시중지 버튼 선택 시 노출되는 UI
GoldPopup,
FishPopup,
POPUP_END,
}

19
Gameton-06/Assets/Gameton/Scripts/UI/FishPopup.cs
View File

@@ -1,19 +0,0 @@
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
namespace TON
{
public class FishPopup : UIBase
{
private void OnEnable()
{
Invoke(nameof(HidePopup), 3f);
}
private void HidePopup()
{
UIManager.Hide<FishPopup>(UIList.FishPopup);
}
}
}

11
Gameton-06/Assets/Gameton/Scripts/UI/FishPopup.cs.meta
View File

@@ -1,11 +0,0 @@
fileFormatVersion: 2
guid: 2e8e4ece5f5d84f43a51d6804fb38019
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

37
Gameton-06/Assets/Gameton/Scripts/UI/GameWinUI.cs
View File

@@ -13,8 +13,9 @@ namespace TON
public readonly string GAME_OVER = "£ GAME OVER £";
public readonly string YOU_WIN = "♧ YOU WIN ♧";
public GameObject rechargeModal;
public GameObject retryModal;
[SerializeField] private GameObject rechargeModal;
[SerializeField] private GameObject retryModal;
[SerializeField] private GameObject fishPopup;
[SerializeField] private TextMeshProUGUI title;
[SerializeField] private TextMeshProUGUI goldReward;
@@ -25,6 +26,9 @@ namespace TON
[SerializeField] private GameObject levelUpText;
[SerializeField] private TextMeshProUGUI fishAmount;
private Coroutine autoCloseCoroutine; // 팝업 닫기 코루틴 저장
private int goldAmount = 0; // 광고 보상 수령 후 초기화
private void OnEnable()
@@ -37,7 +41,6 @@ namespace TON
SetUITextMesh();
UpdateFishCount();
// 해당 UI 노출과 함께 게임 클리어 정보 저장
StageManager.Singleton.StageClear();
@@ -52,6 +55,7 @@ namespace TON
levelUpText.SetActive(false);
rechargeModal.SetActive(false);
retryModal.SetActive(false);
fishPopup.SetActive(false);
}
public void SetUITextMesh()
@@ -145,9 +149,36 @@ namespace TON
{
// 생선 재화 사용 불가 팝업
Debug.Log("생선 재화 사용 불가 팝업");
ShowTimedPopup();
}
});
}
// UI 버튼에 연결할 메서드
public void ShowTimedPopup()
{
// 이미 실행 중인 코루틴이 있다면 중지
if (autoCloseCoroutine != null)
{
StopCoroutine(autoCloseCoroutine);
}
// UI 표시
fishPopup.SetActive(true);
// 자동 닫기 코루틴 시작
autoCloseCoroutine = StartCoroutine(AutoClosePopup());
}
private IEnumerator AutoClosePopup()
{
// Time.timeScale의 영향을 받지 않는 대기
yield return new WaitForSecondsRealtime(3f);
// 시간이 지나면 UI 닫기
fishPopup.SetActive(false);
autoCloseCoroutine = null;
}
private static void AddHeart(int count)
{

2
Gameton-06/Assets/Gameton/Scripts/UI/LobbyUI.cs
View File

@@ -53,7 +53,7 @@ namespace TON
{
int minutes = Mathf.FloorToInt(TOP_RECORD.playTime / 60f);
int seconds = Mathf.FloorToInt(TOP_RECORD.playTime % 60f);
playTime.text = $"{minutes:00}m {seconds:00}s";
playTime.text = $"{minutes:0}m {seconds:0}s";
}
}

44
Gameton-06/Assets/Gameton/Scripts/UI/PauseUI.cs
View File

@@ -10,19 +10,22 @@ namespace TON
{
public static PauseUI Instance => UIManager.Singleton.GetUI<PauseUI>(UIList.PauseUI);
public GameObject rechargeModal;
public GameObject retryModal;
public GameObject homeModal;
[SerializeField] private GameObject rechargeModal;
[SerializeField] private GameObject retryModal;
[SerializeField] private GameObject homeModal;
[SerializeField] private GameObject fishPopup;
[SerializeField] private TextMeshProUGUI fishAmount;
private Coroutine autoCloseCoroutine; // 팝업 닫기 코루틴 저장
void OnEnable()
{
InitModalActive();
UpdateFishCount();
// 일시정지 시 게임 일시정지
Time.timeScale = 0f;
InitModalActive();
UpdateFishCount();
}
public void InitModalActive()
@@ -30,6 +33,7 @@ namespace TON
rechargeModal.SetActive(false);
retryModal.SetActive(false);
homeModal.SetActive(false);
fishPopup.SetActive(false);
}
public void UpdateFishCount()
@@ -111,9 +115,37 @@ namespace TON
{
// 생선 재화 사용 불가 팝업
Debug.Log("생선 재화 사용 불가 팝업");
ShowTimedPopup();
}
});
}
// UI 버튼에 연결할 메서드
public void ShowTimedPopup()
{
// 이미 실행 중인 코루틴이 있다면 중지
if (autoCloseCoroutine != null)
{
StopCoroutine(autoCloseCoroutine);
}
// UI 표시
fishPopup.SetActive(true);
// 자동 닫기 코루틴 시작
autoCloseCoroutine = StartCoroutine(AutoClosePopup());
}
private IEnumerator AutoClosePopup()
{
// Time.timeScale의 영향을 받지 않는 대기
yield return new WaitForSecondsRealtime(3f);
// 시간이 지나면 UI 닫기
fishPopup.SetActive(false);
autoCloseCoroutine = null;
}
private static void AddHeart(int count)
{