diff --git a/Gameton-06/Assets/Gameton/Resources/UI/Prefabs/Modal/UI.RechargeModal.prefab b/Gameton-06/Assets/Gameton/Resources/UI/Prefabs/Modal/UI.RechargeModal.prefab index 1810f90c..0ef4af6d 100644 --- a/Gameton-06/Assets/Gameton/Resources/UI/Prefabs/Modal/UI.RechargeModal.prefab +++ b/Gameton-06/Assets/Gameton/Resources/UI/Prefabs/Modal/UI.RechargeModal.prefab @@ -109,7 +109,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: -110} + m_AnchoredPosition: {x: 0, y: -100} m_SizeDelta: {x: 0, y: 100} m_Pivot: {x: 0.5, y: 1} --- !u!222 &1428581093547786796 @@ -167,8 +167,8 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 42 - m_fontSizeBase: 42 + m_fontSize: 52 + m_fontSizeBase: 52 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 18 @@ -209,6 +209,83 @@ MonoBehaviour: m_hasFontAssetChanged: 0 m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!1 &398882730116395834 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 700396687120542810} + - component: {fileID: 6016060099569069734} + - component: {fileID: 532803147591370977} + m_Layer: 0 + m_Name: Fish Count + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &700396687120542810 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 398882730116395834} + 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: 8119004663799998314} + - {fileID: 3390437138380636720} + m_Father: {fileID: 3713574714318383502} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 1, y: 1} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: -100, y: -120} + m_SizeDelta: {x: 180, y: 60} + m_Pivot: {x: 1, y: 1} +--- !u!222 &6016060099569069734 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 398882730116395834} + m_CullTransparentMesh: 1 +--- !u!114 &532803147591370977 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 398882730116395834} + 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: 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: 042147ed597077d428e0bfc7a9c418a3, 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!1 &638301275177655018 GameObject: m_ObjectHideFlags: 0 @@ -355,7 +432,7 @@ RectTransform: 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: 100} + m_AnchoredPosition: {x: 0, y: 80} m_SizeDelta: {x: 500, y: 80} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7507475248050144314 @@ -940,6 +1017,140 @@ MonoBehaviour: m_hasFontAssetChanged: 0 m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!1 &2661601168432096077 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3390437138380636720} + - component: {fileID: 6733791150629690926} + - component: {fileID: 2720548198562131071} + m_Layer: 0 + m_Name: FishNumberText + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3390437138380636720 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2661601168432096077} + 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: 0} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 700396687120542810} + 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: 15, y: 0} + m_SizeDelta: {x: -60, y: 60} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &6733791150629690926 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2661601168432096077} + m_CullTransparentMesh: 1 +--- !u!114 &2720548198562131071 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2661601168432096077} + 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: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_text: 0 + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 3116464c7616674448f2fb05b50bf91b, type: 2} + m_sharedMaterial: {fileID: -5364670637895760327, guid: 3116464c7616674448f2fb05b50bf91b, 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: 24 + m_fontSizeBase: 24 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 4 + m_VerticalAlignment: 512 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 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 &3844590652309306987 GameObject: m_ObjectHideFlags: 0 @@ -1374,6 +1585,81 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!1 &5761908206106996468 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8119004663799998314} + - component: {fileID: 8879613877952606850} + - component: {fileID: 4486418773545054998} + m_Layer: 0 + m_Name: FishImage + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &8119004663799998314 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5761908206106996468} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0.5, y: 0.5, z: 0} + m_ConstrainProportionsScale: 1 + m_Children: [] + m_Father: {fileID: 700396687120542810} + 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: 15, y: 0} + m_SizeDelta: {x: 50, y: 50} + m_Pivot: {x: 0, y: 0.5} +--- !u!222 &8879613877952606850 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5761908206106996468} + m_CullTransparentMesh: 1 +--- !u!114 &4486418773545054998 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5761908206106996468} + 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: 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: 2a7ebc1a1db3b254cba02aef92d8852d, 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!1 &6007186880167044805 GameObject: m_ObjectHideFlags: 0 @@ -1405,6 +1691,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 8887107652535229178} + - {fileID: 700396687120542810} - {fileID: 6498735799474681239} - {fileID: 7377135486828206191} - {fileID: 6482420409566056253} diff --git a/Gameton-06/Assets/Gameton/Resources/UI/Prefabs/UI.GameWinUI.prefab b/Gameton-06/Assets/Gameton/Resources/UI/Prefabs/UI.GameWinUI.prefab index 631d2ec2..9f6653a6 100644 --- a/Gameton-06/Assets/Gameton/Resources/UI/Prefabs/UI.GameWinUI.prefab +++ b/Gameton-06/Assets/Gameton/Resources/UI/Prefabs/UI.GameWinUI.prefab @@ -2109,6 +2109,7 @@ MonoBehaviour: playTime: {fileID: 5304547458457958128} score: {fileID: 3157649585156346879} levelUpText: {fileID: 1864275481456212670} + fishAmount: {fileID: 3888773272962236349} --- !u!1 &6514519765443300279 GameObject: m_ObjectHideFlags: 0 @@ -3155,13 +3156,53 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: -100 objectReference: {fileID: 0} - - target: {fileID: 1194212059389526510, guid: f4a016815da869a4dad6d8dc7e8aab79, type: 3} - propertyPath: m_fontAsset - value: + - target: {fileID: 532803147591370977, guid: f4a016815da869a4dad6d8dc7e8aab79, type: 3} + propertyPath: m_Color.b + value: 0.9529412 objectReference: {fileID: 0} - - target: {fileID: 1194212059389526510, guid: f4a016815da869a4dad6d8dc7e8aab79, type: 3} - propertyPath: m_sharedMaterial + - target: {fileID: 532803147591370977, guid: f4a016815da869a4dad6d8dc7e8aab79, type: 3} + propertyPath: m_Color.r + value: 0.7490196 + objectReference: {fileID: 0} + - target: {fileID: 1150813010971508066, guid: f4a016815da869a4dad6d8dc7e8aab79, type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1150813010971508066, guid: f4a016815da869a4dad6d8dc7e8aab79, type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1150813010971508066, guid: f4a016815da869a4dad6d8dc7e8aab79, type: 3} + propertyPath: m_SizeDelta.x + value: 51 + objectReference: {fileID: 0} + - target: {fileID: 1150813010971508066, guid: f4a016815da869a4dad6d8dc7e8aab79, type: 3} + propertyPath: m_SizeDelta.y + value: 45 + objectReference: {fileID: 0} + - target: {fileID: 1150813010971508066, guid: f4a016815da869a4dad6d8dc7e8aab79, type: 3} + propertyPath: m_AnchoredPosition.x + value: 259.5 + objectReference: {fileID: 0} + - target: {fileID: 1150813010971508066, guid: f4a016815da869a4dad6d8dc7e8aab79, type: 3} + propertyPath: m_AnchoredPosition.y + value: -37.5 + objectReference: {fileID: 0} + - target: {fileID: 1312516987361587835, guid: f4a016815da869a4dad6d8dc7e8aab79, type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Mode + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 1312516987361587835, guid: f4a016815da869a4dad6d8dc7e8aab79, type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target value: + objectReference: {fileID: 2648027058164122620} + - target: {fileID: 1312516987361587835, guid: f4a016815da869a4dad6d8dc7e8aab79, type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName + value: OnClickUseCashButton + objectReference: {fileID: 0} + - target: {fileID: 1312516987361587835, guid: f4a016815da869a4dad6d8dc7e8aab79, type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName + value: TON.GameWinUI, Assembly-CSharp objectReference: {fileID: 0} - target: {fileID: 1632260334339437034, guid: f4a016815da869a4dad6d8dc7e8aab79, type: 3} propertyPath: m_AnchorMax.y @@ -3179,29 +3220,29 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: -100 objectReference: {fileID: 0} - - target: {fileID: 2014817396651137805, guid: f4a016815da869a4dad6d8dc7e8aab79, type: 3} - propertyPath: m_fontAsset - value: + - target: {fileID: 1750486691344034846, guid: f4a016815da869a4dad6d8dc7e8aab79, type: 3} + propertyPath: m_AnchorMax.y + value: 1 objectReference: {fileID: 0} - - target: {fileID: 2014817396651137805, guid: f4a016815da869a4dad6d8dc7e8aab79, type: 3} - propertyPath: m_sharedMaterial - value: + - target: {fileID: 1750486691344034846, guid: f4a016815da869a4dad6d8dc7e8aab79, type: 3} + propertyPath: m_AnchorMin.y + value: 1 objectReference: {fileID: 0} - - target: {fileID: 2439009261392671061, guid: f4a016815da869a4dad6d8dc7e8aab79, type: 3} - propertyPath: m_fontAsset - value: + - target: {fileID: 1750486691344034846, guid: f4a016815da869a4dad6d8dc7e8aab79, type: 3} + propertyPath: m_SizeDelta.x + value: 51 objectReference: {fileID: 0} - - target: {fileID: 2439009261392671061, guid: f4a016815da869a4dad6d8dc7e8aab79, type: 3} - propertyPath: m_sharedMaterial - value: + - target: {fileID: 1750486691344034846, guid: f4a016815da869a4dad6d8dc7e8aab79, type: 3} + propertyPath: m_SizeDelta.y + value: 45 objectReference: {fileID: 0} - - target: {fileID: 3126860217420620659, guid: f4a016815da869a4dad6d8dc7e8aab79, type: 3} - propertyPath: m_fontAsset - value: + - target: {fileID: 1750486691344034846, guid: f4a016815da869a4dad6d8dc7e8aab79, type: 3} + propertyPath: m_AnchoredPosition.x + value: 203.5 objectReference: {fileID: 0} - - target: {fileID: 3126860217420620659, guid: f4a016815da869a4dad6d8dc7e8aab79, type: 3} - propertyPath: m_sharedMaterial - value: + - target: {fileID: 1750486691344034846, guid: f4a016815da869a4dad6d8dc7e8aab79, type: 3} + propertyPath: m_AnchoredPosition.y + value: -37.5 objectReference: {fileID: 0} - target: {fileID: 3240794480833331071, guid: f4a016815da869a4dad6d8dc7e8aab79, type: 3} propertyPath: m_Pivot.x @@ -3283,6 +3324,42 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 3415751508290410392, guid: f4a016815da869a4dad6d8dc7e8aab79, type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3415751508290410392, guid: f4a016815da869a4dad6d8dc7e8aab79, type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3415751508290410392, guid: f4a016815da869a4dad6d8dc7e8aab79, type: 3} + propertyPath: m_SizeDelta.x + value: 51 + objectReference: {fileID: 0} + - target: {fileID: 3415751508290410392, guid: f4a016815da869a4dad6d8dc7e8aab79, type: 3} + propertyPath: m_SizeDelta.y + value: 45 + objectReference: {fileID: 0} + - target: {fileID: 3415751508290410392, guid: f4a016815da869a4dad6d8dc7e8aab79, type: 3} + propertyPath: m_AnchoredPosition.x + value: 35.5 + objectReference: {fileID: 0} + - target: {fileID: 3415751508290410392, guid: f4a016815da869a4dad6d8dc7e8aab79, type: 3} + propertyPath: m_AnchoredPosition.y + value: -37.5 + objectReference: {fileID: 0} + - target: {fileID: 4257220602582184208, guid: f4a016815da869a4dad6d8dc7e8aab79, type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target + value: + objectReference: {fileID: 2648027058164122620} + - target: {fileID: 4257220602582184208, guid: f4a016815da869a4dad6d8dc7e8aab79, type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName + value: OnClickUseCashButton + objectReference: {fileID: 0} + - target: {fileID: 4257220602582184208, guid: f4a016815da869a4dad6d8dc7e8aab79, type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName + value: TON.GameWinUI, Assembly-CSharp + objectReference: {fileID: 0} - target: {fileID: 4542825537873683785, guid: f4a016815da869a4dad6d8dc7e8aab79, type: 3} propertyPath: m_Name value: UI.RechargeModal @@ -3291,22 +3368,6 @@ PrefabInstance: propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} - - target: {fileID: 5402616116801220212, guid: f4a016815da869a4dad6d8dc7e8aab79, type: 3} - propertyPath: m_fontAsset - value: - objectReference: {fileID: 0} - - target: {fileID: 5402616116801220212, guid: f4a016815da869a4dad6d8dc7e8aab79, type: 3} - propertyPath: m_sharedMaterial - value: - objectReference: {fileID: 0} - - target: {fileID: 5607894149688796868, guid: f4a016815da869a4dad6d8dc7e8aab79, type: 3} - propertyPath: m_fontAsset - value: - objectReference: {fileID: 0} - - target: {fileID: 5607894149688796868, guid: f4a016815da869a4dad6d8dc7e8aab79, type: 3} - propertyPath: m_sharedMaterial - value: - objectReference: {fileID: 0} - target: {fileID: 6005301849909924835, guid: f4a016815da869a4dad6d8dc7e8aab79, type: 3} propertyPath: m_AnchorMax.y value: 1 @@ -3323,13 +3384,29 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: -100 objectReference: {fileID: 0} - - target: {fileID: 7681041094976077926, guid: f4a016815da869a4dad6d8dc7e8aab79, type: 3} - propertyPath: m_fontAsset - value: + - target: {fileID: 6869740172896691300, guid: f4a016815da869a4dad6d8dc7e8aab79, type: 3} + propertyPath: m_AnchorMax.y + value: 1 objectReference: {fileID: 0} - - target: {fileID: 7681041094976077926, guid: f4a016815da869a4dad6d8dc7e8aab79, type: 3} - propertyPath: m_sharedMaterial - value: + - target: {fileID: 6869740172896691300, guid: f4a016815da869a4dad6d8dc7e8aab79, type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6869740172896691300, guid: f4a016815da869a4dad6d8dc7e8aab79, type: 3} + propertyPath: m_SizeDelta.x + value: 51 + objectReference: {fileID: 0} + - target: {fileID: 6869740172896691300, guid: f4a016815da869a4dad6d8dc7e8aab79, type: 3} + propertyPath: m_SizeDelta.y + value: 45 + objectReference: {fileID: 0} + - target: {fileID: 6869740172896691300, guid: f4a016815da869a4dad6d8dc7e8aab79, type: 3} + propertyPath: m_AnchoredPosition.x + value: 147.5 + objectReference: {fileID: 0} + - target: {fileID: 6869740172896691300, guid: f4a016815da869a4dad6d8dc7e8aab79, type: 3} + propertyPath: m_AnchoredPosition.y + value: -37.5 objectReference: {fileID: 0} - target: {fileID: 8371766031526851110, guid: f4a016815da869a4dad6d8dc7e8aab79, type: 3} propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Mode @@ -3351,6 +3428,30 @@ PrefabInstance: propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_StringArgument value: recharge objectReference: {fileID: 0} + - target: {fileID: 8911194147253732922, guid: f4a016815da869a4dad6d8dc7e8aab79, type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8911194147253732922, guid: f4a016815da869a4dad6d8dc7e8aab79, type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8911194147253732922, guid: f4a016815da869a4dad6d8dc7e8aab79, type: 3} + propertyPath: m_SizeDelta.x + value: 51 + objectReference: {fileID: 0} + - target: {fileID: 8911194147253732922, guid: f4a016815da869a4dad6d8dc7e8aab79, type: 3} + propertyPath: m_SizeDelta.y + value: 45 + objectReference: {fileID: 0} + - target: {fileID: 8911194147253732922, guid: f4a016815da869a4dad6d8dc7e8aab79, type: 3} + propertyPath: m_AnchoredPosition.x + value: 91.5 + objectReference: {fileID: 0} + - target: {fileID: 8911194147253732922, guid: f4a016815da869a4dad6d8dc7e8aab79, type: 3} + propertyPath: m_AnchoredPosition.y + value: -37.5 + objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] @@ -3361,6 +3462,17 @@ GameObject: m_CorrespondingSourceObject: {fileID: 4542825537873683785, guid: f4a016815da869a4dad6d8dc7e8aab79, type: 3} m_PrefabInstance: {fileID: 1168374711096021954} m_PrefabAsset: {fileID: 0} +--- !u!114 &3888773272962236349 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 2720548198562131071, guid: f4a016815da869a4dad6d8dc7e8aab79, type: 3} + m_PrefabInstance: {fileID: 1168374711096021954} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!224 &4381857254374141117 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 3240794480833331071, guid: f4a016815da869a4dad6d8dc7e8aab79, type: 3} diff --git a/Gameton-06/Assets/Gameton/Scripts/Character/Heart/HeartDataManager.cs b/Gameton-06/Assets/Gameton/Scripts/Character/Heart/HeartDataManager.cs index e6e2928c..5d26296c 100644 --- a/Gameton-06/Assets/Gameton/Scripts/Character/Heart/HeartDataManager.cs +++ b/Gameton-06/Assets/Gameton/Scripts/Character/Heart/HeartDataManager.cs @@ -144,6 +144,12 @@ namespace TON } } + // 사용자의 광고 시청, 생선 소모 등으로 하트 충전하는 경우 호출출 + public void AddHeart(int amount) + { + + } + // 데이터 파일에 저장된 마지막 하트 사용시간과 동기화 public int GetRemainingRechargeTime() { diff --git a/Gameton-06/Assets/Gameton/Scripts/UI/GameWinUI.cs b/Gameton-06/Assets/Gameton/Scripts/UI/GameWinUI.cs index 5fd5d9c4..221f2929 100644 --- a/Gameton-06/Assets/Gameton/Scripts/UI/GameWinUI.cs +++ b/Gameton-06/Assets/Gameton/Scripts/UI/GameWinUI.cs @@ -24,18 +24,21 @@ namespace TON [SerializeField] private TextMeshProUGUI playTime; [SerializeField] private TextMeshProUGUI score; [SerializeField] private GameObject levelUpText; + [SerializeField] private TextMeshProUGUI fishAmount; private void OnEnable() { InitModalActive(); SetUITextMesh(); + UpdateFishCount(); + // 해당 UI 노출과 함께 게임 클리어 정보 저장 StageManager.Singleton.StageClear(); // 현재 획득한 경험치로 인한 레벨업 처리 SetLevelUpText(StageManager.Singleton.expReward); - // TODO: 획득한 아이템 정보 저장 로직 구현 + // TODO: 획득한 골드 정보 저장 로직 구현 } @@ -57,6 +60,13 @@ namespace TON playTime.text = $"{StageManager.Singleton.PlayTime / 60}m {StageManager.Singleton.PlayTime % 60:F2}s"; } + public void UpdateFishCount() + { + fishAmount.text = string.Format("{0:#,###}", PlayerDataManager.Singleton.fishAmount); + + } + + // 경험치 추가 및 레벨업 처리 public void SetLevelUpText(int amount) { @@ -77,6 +87,8 @@ namespace TON } public void OnClickHomeButton() { + UIManager.Hide(UIList.GameWinUI); + Main.Singleton.ChangeScene(SceneType.Lobby); } @@ -99,6 +111,7 @@ namespace TON // 입장 시 하트 소모 HeartDataManager.Singleton.UseHeart(); + UIManager.Hide(UIList.GameWinUI); Main.Singleton.ChangeScene(SceneType.Stage); } @@ -122,12 +135,28 @@ namespace TON { // TODO: 보유한 생선 갯수를 소모하고 하트를 충전 Debug.Log("OnClickUseCashButton::: fish :: " + count); + + switch (count) + { + case 5: + // 하트 1개 충전 + + break; + case 45: + // 하트 10개 충전 + + break; + } } public void OnClickAdButton() { // TODO: 광고 시청 로직 추가, 하트를 충전 Debug.Log("OnClickAdButton::: "); + + + // 광고 시청 종료 후 콜백 + rechargeModal.SetActive(false); } public void OnClickAdForGoldButton()