diff --git a/Assets/01.Scenes/99.Tycoon_LMG.unity b/Assets/01.Scenes/99.Tycoon_LMG.unity index 542ba5a90..0659c9879 100644 --- a/Assets/01.Scenes/99.Tycoon_LMG.unity +++ b/Assets/01.Scenes/99.Tycoon_LMG.unity @@ -463,7 +463,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 130} m_Pivot: {x: 0, y: 1} --- !u!114 &5885679 MonoBehaviour: @@ -2883,6 +2883,142 @@ RectTransform: m_AnchoredPosition: {x: 900, y: -300} m_SizeDelta: {x: 600, y: 600} m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &153127956 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 153127957} + - component: {fileID: 153127959} + - component: {fileID: 153127958} + m_Layer: 0 + m_Name: Rank + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &153127957 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 153127956} + 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: 687136862} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: -375, y: 0} + m_SizeDelta: {x: -750, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &153127958 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 153127956} + 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: "\uB7AD\uD0B9" + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 2f35c40df3d2a1a41b57c8b9eca40913, type: 2} + m_sharedMaterial: {fileID: 1328173432319114220, guid: 2f35c40df3d2a1a41b57c8b9eca40913, 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: 44.2 + m_fontSizeBase: 36 + m_fontWeight: 400 + m_enableAutoSizing: 1 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 2 + 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_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!222 &153127959 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 153127956} + m_CullTransparentMesh: 1 --- !u!1 &166220739 GameObject: m_ObjectHideFlags: 0 @@ -3532,8 +3668,9 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: + - {fileID: 687136862} - {fileID: 49580636} - m_Father: {fileID: 1168168701} + m_Father: {fileID: 959194352} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -4461,7 +4598,7 @@ MonoBehaviour: m_text: "\uC88C\uC11D \uCD94\uAC00" m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 2f35c40df3d2a1a41b57c8b9eca40913, type: 2} - m_sharedMaterial: {fileID: 2100000, guid: 12575fbfb1a20814aae86a588932b912, type: 2} + m_sharedMaterial: {fileID: 2100000, guid: 9947b1354b378444a9ee964e90f4144c, type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] @@ -4491,7 +4628,7 @@ MonoBehaviour: m_enableAutoSizing: 0 m_fontSizeMin: 18 m_fontSizeMax: 72 - m_fontStyle: 1 + m_fontStyle: 0 m_HorizontalAlignment: 2 m_VerticalAlignment: 512 m_textAlignment: 65535 @@ -5460,12 +5597,13 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 5885678} + - {fileID: 587529212} m_Father: {fileID: 49580636} 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_SizeDelta: {x: -17, y: 0} m_Pivot: {x: 0, y: 1} --- !u!114 &359803103 MonoBehaviour: @@ -5906,7 +6044,7 @@ MonoBehaviour: m_text: "\uC8FC\uC810 \uC99D\uCD95" m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 2f35c40df3d2a1a41b57c8b9eca40913, type: 2} - m_sharedMaterial: {fileID: 2100000, guid: 12575fbfb1a20814aae86a588932b912, type: 2} + m_sharedMaterial: {fileID: 2100000, guid: 9947b1354b378444a9ee964e90f4144c, type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] @@ -5936,7 +6074,7 @@ MonoBehaviour: m_enableAutoSizing: 1 m_fontSizeMin: 40 m_fontSizeMax: 100 - m_fontStyle: 1 + m_fontStyle: 0 m_HorizontalAlignment: 2 m_VerticalAlignment: 512 m_textAlignment: 65535 @@ -7834,6 +7972,81 @@ MonoBehaviour: shakeLimit: 10 fallSpeed: 200 shakeInterval: 0.01 +--- !u!1 &505475253 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 505475254} + - component: {fileID: 505475256} + - component: {fileID: 505475255} + m_Layer: 0 + m_Name: Background + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &505475254 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 505475253} + 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: 959194352} + 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!114 &505475255 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 505475253} + 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: 0, g: 0, b: 0, a: 0.98039216} + 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: 0} + 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 &505475256 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 505475253} + m_CullTransparentMesh: 1 --- !u!1 &506336967 GameObject: m_ObjectHideFlags: 0 @@ -9501,6 +9714,144 @@ RectTransform: m_CorrespondingSourceObject: {fileID: 3997465226346976133, guid: b7ec42093fecf23439afbcf6ebd755db, type: 3} m_PrefabInstance: {fileID: 571403219} m_PrefabAsset: {fileID: 0} +--- !u!1 &587529211 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 587529212} + - component: {fileID: 587529214} + - component: {fileID: 587529213} + m_Layer: 0 + m_Name: NetworkInfo + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &587529212 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 587529211} + 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: 359803102} + 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!114 &587529213 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 587529211} + 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: "\uB7AD\uD06C \uC811\uC18D\uC911...\n\n\uB7AD\uD06C\uC5D0 \uC5F0\uACB0\uD560 + \uC218 \uC5C6\uC2B5\uB2C8\uB2E4. \n\uC778\uD130\uB137\uC774\uB098 \uB124\uD2B8\uC6CC\uD06C + \uC0C1\uD0DC\uB97C \uD655\uC778\uD574 \uC8FC\uC138\uC694." + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 2f35c40df3d2a1a41b57c8b9eca40913, type: 2} + m_sharedMaterial: {fileID: 1328173432319114220, guid: 2f35c40df3d2a1a41b57c8b9eca40913, 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: 36 + m_fontSizeBase: 36 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 2 + 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_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!222 &587529214 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 587529211} + m_CullTransparentMesh: 1 --- !u!1 &587565434 GameObject: m_ObjectHideFlags: 0 @@ -9680,7 +10031,7 @@ MonoBehaviour: m_text: "\uC7AC\uB8CC \uCD94\uAC00" m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 2f35c40df3d2a1a41b57c8b9eca40913, type: 2} - m_sharedMaterial: {fileID: 2100000, guid: 12575fbfb1a20814aae86a588932b912, type: 2} + m_sharedMaterial: {fileID: 2100000, guid: 9947b1354b378444a9ee964e90f4144c, type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] @@ -9710,7 +10061,7 @@ MonoBehaviour: m_enableAutoSizing: 0 m_fontSizeMin: 18 m_fontSizeMax: 72 - m_fontStyle: 1 + m_fontStyle: 0 m_HorizontalAlignment: 2 m_VerticalAlignment: 512 m_textAlignment: 65535 @@ -11291,6 +11642,104 @@ RectTransform: m_AnchoredPosition: {x: 110, y: -50} m_SizeDelta: {x: 28.5, y: 100} m_Pivot: {x: 0, y: 0.5} +--- !u!1 &687136861 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 687136862} + - component: {fileID: 687136865} + - component: {fileID: 687136864} + - component: {fileID: 687136863} + m_Layer: 0 + m_Name: RankText + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &687136862 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 687136861} + 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: 153127957} + - {fileID: 1161895787} + - {fileID: 1092546450} + - {fileID: 888316134} + - {fileID: 1025386097} + m_Father: {fileID: 188768224} + 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: -8.5, y: 385} + m_SizeDelta: {x: 860, y: 50} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &687136863 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 687136861} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4b9215935020b4a4fba279c3a6effef9, type: 3} + m_Name: + m_EditorClassIdentifier: + rankText: {fileID: 0} + nameText: {fileID: 0} + goldText: {fileID: 0} + timeText: {fileID: 0} + triesText: {fileID: 0} +--- !u!114 &687136864 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 687136861} + 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: 0, b: 0, a: 0.5254902} + 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: 0} + 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 &687136865 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 687136861} + m_CullTransparentMesh: 1 --- !u!1001 &696720514 PrefabInstance: m_ObjectHideFlags: 0 @@ -11666,6 +12115,58 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &718854180 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 718854181} + - component: {fileID: 718854182} + m_Layer: 0 + m_Name: GameClearUi + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &718854181 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 718854180} + 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: 1903866768} + m_Father: {fileID: 1861226431} + 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!114 &718854182 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 718854180} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: aa42998c0e2cf554a9ecb3fe52f0ec1d, type: 3} + m_Name: + m_EditorClassIdentifier: + _panel: {fileID: 1903866767} + _stempImage: {fileID: 1204223594} + _backgroundImage: {fileID: 1307869343} --- !u!1 &729725316 GameObject: m_ObjectHideFlags: 0 @@ -13577,6 +14078,142 @@ Transform: m_Children: [] m_Father: {fileID: 1360757596} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &888316133 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 888316134} + - component: {fileID: 888316136} + - component: {fileID: 888316135} + m_Layer: 0 + m_Name: Time + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &888316134 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 888316133} + 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: 687136862} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 200, y: 0} + m_SizeDelta: {x: -700, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &888316135 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 888316133} + 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: "\uC2DC\uAC04" + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 2f35c40df3d2a1a41b57c8b9eca40913, type: 2} + m_sharedMaterial: {fileID: 1328173432319114220, guid: 2f35c40df3d2a1a41b57c8b9eca40913, 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: 44.2 + m_fontSizeBase: 36 + m_fontWeight: 400 + m_enableAutoSizing: 1 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 2 + 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_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!222 &888316136 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 888316133} + m_CullTransparentMesh: 1 --- !u!1 &900270166 GameObject: m_ObjectHideFlags: 0 @@ -14358,6 +14995,43 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 955806322} m_CullTransparentMesh: 1 +--- !u!1 &959194351 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 959194352} + m_Layer: 5 + m_Name: Panel + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &959194352 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 959194351} + 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: 505475254} + - {fileID: 188768224} + m_Father: {fileID: 1168168701} + 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!1 &963867002 GameObject: m_ObjectHideFlags: 0 @@ -15247,6 +15921,142 @@ MonoBehaviour: _panel: {fileID: 1232014580} _contents: {fileID: 1920312147} _openSfxName: OpenNormalRewardBox +--- !u!1 &1025386096 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1025386097} + - component: {fileID: 1025386099} + - component: {fileID: 1025386098} + m_Layer: 0 + m_Name: Tries + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1025386097 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1025386096} + 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: 687136862} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 375, y: 0} + m_SizeDelta: {x: -750, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1025386098 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1025386096} + 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: "\uD2B8\uB77C\uC774\uC218" + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 2f35c40df3d2a1a41b57c8b9eca40913, type: 2} + m_sharedMaterial: {fileID: 1328173432319114220, guid: 2f35c40df3d2a1a41b57c8b9eca40913, 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: 30.35 + m_fontSizeBase: 36 + m_fontWeight: 400 + m_enableAutoSizing: 1 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 2 + 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_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!222 &1025386099 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1025386096} + m_CullTransparentMesh: 1 --- !u!1 &1030267970 GameObject: m_ObjectHideFlags: 0 @@ -15954,6 +16764,142 @@ RectTransform: m_AnchoredPosition: {x: 0, y: -350} m_SizeDelta: {x: 0, y: 240} m_Pivot: {x: 0.5, y: 1} +--- !u!1 &1092546449 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1092546450} + - component: {fileID: 1092546452} + - component: {fileID: 1092546451} + m_Layer: 0 + m_Name: Gold + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1092546450 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1092546449} + 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: 687136862} + 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: -700, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1092546451 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1092546449} + 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: "\uACE8\uB4DC" + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 2f35c40df3d2a1a41b57c8b9eca40913, type: 2} + m_sharedMaterial: {fileID: 1328173432319114220, guid: 2f35c40df3d2a1a41b57c8b9eca40913, 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: 44.2 + m_fontSizeBase: 36 + m_fontWeight: 400 + m_enableAutoSizing: 1 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 2 + 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_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!222 &1092546452 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1092546449} + m_CullTransparentMesh: 1 --- !u!4 &1098795502 stripped Transform: m_CorrespondingSourceObject: {fileID: 4798925548635759970, guid: 9a394d3c65c71084d8345c36df67c89c, type: 3} @@ -16827,6 +17773,142 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 4a913a50ec8eef748a69d8cc48698372, type: 3} +--- !u!1 &1161895786 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1161895787} + - component: {fileID: 1161895789} + - component: {fileID: 1161895788} + m_Layer: 0 + m_Name: Name + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1161895787 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1161895786} + 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: 687136862} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: -225, y: 0} + m_SizeDelta: {x: -650, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1161895788 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1161895786} + 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: "\uB2C9\uB124\uC784" + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 2f35c40df3d2a1a41b57c8b9eca40913, type: 2} + m_sharedMaterial: {fileID: 1328173432319114220, guid: 2f35c40df3d2a1a41b57c8b9eca40913, 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: 44.2 + m_fontSizeBase: 36 + m_fontWeight: 400 + m_enableAutoSizing: 1 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 2 + 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_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!222 &1161895789 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1161895786} + m_CullTransparentMesh: 1 --- !u!1 &1162664200 GameObject: m_ObjectHideFlags: 0 @@ -16912,7 +17994,7 @@ GameObject: m_Component: - component: {fileID: 1168168701} m_Layer: 5 - m_Name: RankUi + m_Name: _RankUi m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -16930,7 +18012,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 188768224} + - {fileID: 959194352} m_Father: {fileID: 1861226431} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} @@ -17366,6 +18448,81 @@ MonoBehaviour: m_Spacing: {x: 10, y: 0} m_Constraint: 1 m_ConstraintCount: 5 +--- !u!1 &1204223592 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1204223593} + - component: {fileID: 1204223595} + - component: {fileID: 1204223594} + m_Layer: 0 + m_Name: Stemp + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1204223593 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1204223592} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 5, y: 5, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1903866768} + 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: 700, y: 700} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1204223594 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1204223592} + 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: 3f99828f3b98ef441a7ea3d87faec372, 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 &1204223595 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1204223592} + m_CullTransparentMesh: 1 --- !u!1 &1222632320 GameObject: m_ObjectHideFlags: 0 @@ -18401,6 +19558,81 @@ RectTransform: m_CorrespondingSourceObject: {fileID: 352852137782453654, guid: 4a913a50ec8eef748a69d8cc48698372, type: 3} m_PrefabInstance: {fileID: 971527921} m_PrefabAsset: {fileID: 0} +--- !u!1 &1307869341 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1307869342} + - component: {fileID: 1307869344} + - component: {fileID: 1307869343} + m_Layer: 0 + m_Name: Background + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1307869342 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1307869341} + 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: 1903866768} + 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!114 &1307869343 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1307869341} + 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: 0, g: 0, b: 0, a: 0.78431374} + 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: 0} + 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 &1307869344 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1307869341} + m_CullTransparentMesh: 1 --- !u!1 &1308258165 GameObject: m_ObjectHideFlags: 0 @@ -18611,10 +19843,10 @@ RectTransform: - {fileID: 1852678621} m_Father: {fileID: 5885678} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 481.5, y: -65} + m_SizeDelta: {x: 860, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1316550836 MonoBehaviour: @@ -18628,6 +19860,11 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 4b9215935020b4a4fba279c3a6effef9, type: 3} m_Name: m_EditorClassIdentifier: + rankText: {fileID: 0} + nameText: {fileID: 0} + goldText: {fileID: 0} + timeText: {fileID: 0} + triesText: {fileID: 0} --- !u!114 &1316550837 MonoBehaviour: m_ObjectHideFlags: 0 @@ -28751,7 +29988,7 @@ RectTransform: m_Father: {fileID: 730358493} 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: 20, y: 20} m_Pivot: {x: 0.5, y: 0.5} @@ -29816,6 +31053,7 @@ RectTransform: - {fileID: 1733600342} - {fileID: 784951362} - {fileID: 487445514} + - {fileID: 718854181} - {fileID: 460981318} - {fileID: 1168168701} - {fileID: 2055805161} @@ -30349,6 +31587,43 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1903866767 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1903866768} + m_Layer: 0 + m_Name: Panel + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &1903866768 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1903866767} + 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: 1307869342} + - {fileID: 1204223593} + m_Father: {fileID: 718854181} + 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!1 &1906345107 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/02.Scripts/FirebaseDatabaseManager.cs b/Assets/02.Scripts/FirebaseDatabaseManager.cs new file mode 100644 index 000000000..f174da9b2 --- /dev/null +++ b/Assets/02.Scripts/FirebaseDatabaseManager.cs @@ -0,0 +1,52 @@ +using System.Collections.Generic; +using Sirenix.OdinInspector; + + +namespace BlueWater +{ + public class FirebaseUserData + { + + static FirebaseUserData Create(string userName) + { + FirebaseUserData userData = new FirebaseUserData(); + + return userData; + } + + public string _nickname { get; private set;} + public int _round { get; private set;} + public int _gold { get; private set;} + public int _time { get; private set;} + public int _tries { get; private set;} + } + + public class FirebaseDatabaseManager : Singleton + { + private List _userDatas; + + public void WriteData(FirebaseUserData userData) + { + + } + + public void ReadData() + { + _userDatas.Clear(); + + + } + + protected override void OnAwake() + { + InitializeComponents(); + } + + [Button("컴포넌트 초기화")] + private void InitializeComponents() + { + + } + + } +} \ No newline at end of file diff --git a/Assets/02.Scripts/FirebaseDatabaseManager.cs.meta b/Assets/02.Scripts/FirebaseDatabaseManager.cs.meta new file mode 100644 index 000000000..fb659079b --- /dev/null +++ b/Assets/02.Scripts/FirebaseDatabaseManager.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: e511025671c43384fbcde655ce9d1214 \ No newline at end of file diff --git a/Assets/02.Scripts/Tycoon/GameClear.cs b/Assets/02.Scripts/Tycoon/GameClear.cs new file mode 100644 index 000000000..987deb190 --- /dev/null +++ b/Assets/02.Scripts/Tycoon/GameClear.cs @@ -0,0 +1,84 @@ +using System.Collections; +using BlueWater; +using BlueWater.Uis; +using UnityEngine; +using UnityEngine.UI; + +public class GameClear: PopupUi +{ + [SerializeField] + private GameObject _panel; + + [SerializeField] + private Image _stempImage; + + [SerializeField] + private Image _backgroundImage; + + private void Start() + { + EventManager.OnLevelUp += StartClearPopup; + } + + private void OnDestroy() + { + EventManager.OnLevelUp -= StartClearPopup; + } + + public override void Open() + { + VisualFeedbackManager.Instance.SetBaseTimeScale(0.0f); + PlayerInputKeyManager.Instance.SwitchCurrentActionMap(InputActionMaps.TycoonUi); + PopupUiController.RegisterPopup(this); + _panel.SetActive(true); + IsOpened = true; + StartCoroutine(StartClearPopupCoroutine()); + } + + public override void Close() + { + _panel.SetActive(false); + PopupUiController.UnregisterPopup(this); + PlayerInputKeyManager.Instance.SwitchCurrentActionMap(InputActionMaps.Tycoon); + IsOpened = false; + VisualFeedbackManager.Instance.ResetTimeScale(); + EventManager.InvokeShowResult(); + } + + private void StartClearPopup(LevelData currentLevelData) + { + Debug.Log("Clear!!" + currentLevelData.Idx); + if (currentLevelData.Idx != 100.ToString()) return; + Open(); + + } + + private IEnumerator StartClearPopupCoroutine() + { + float timer = 0f; + + while (timer < 0.5) + { + timer += Time.unscaledDeltaTime; + + float t = timer / 0.5f; + float easedT = EaseEffect.BounceOut(t); + + _stempImage.transform.localScale = + Vector3.Lerp(new Vector3(5.0f, 5.0f, 1.0f), new Vector3(1.0f, 1.0f, 1.0f), easedT); + + yield return null; + } + + timer = 0f; + + while (timer < 3.0) //단순 딜레이 + { + timer += Time.unscaledDeltaTime; + yield return null; + } + + Close(); + } + +} diff --git a/Assets/02.Scripts/Tycoon/GameClear.cs.meta b/Assets/02.Scripts/Tycoon/GameClear.cs.meta new file mode 100644 index 000000000..6e83f0cf1 --- /dev/null +++ b/Assets/02.Scripts/Tycoon/GameClear.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: aa42998c0e2cf554a9ecb3fe52f0ec1d \ No newline at end of file diff --git a/Assets/02.Scripts/Ui/Tycoon/RankRow.cs b/Assets/02.Scripts/Ui/Tycoon/RankRow.cs index 97c922bef..a94f05081 100644 --- a/Assets/02.Scripts/Ui/Tycoon/RankRow.cs +++ b/Assets/02.Scripts/Ui/Tycoon/RankRow.cs @@ -1,19 +1,130 @@ +using System.Collections.Generic; +using System.Collections; +using System.Globalization; +using System.Threading.Tasks; +using UnityEngine.Networking; +using Firebase.Database; +using Firebase.Extensions; +using TMPro; using UnityEngine; public class RankRow : MonoBehaviour { + private DatabaseReference m_Reference; + + [SerializeField] + private TextMeshPro rankText; + [SerializeField] + private TextMeshPro nameText; + [SerializeField] + private TextMeshPro goldText; + + [SerializeField] + private TextMeshPro timeText; + + [SerializeField] + private TextMeshPro triesText; - // Start is called once before the first execution of Update after the MonoBehaviour is created void Start() { - + m_Reference = FirebaseDatabase.DefaultInstance.RootReference; } - - // Update is called once per frame - void Update() + + public void WriteUserData(string nickname) { + string currentLanguage = CultureInfo.CurrentCulture.Name; // 예: "en-US" + string ipAddress = GetPublicIP(); //공인 IP 주소 + if (string.IsNullOrEmpty(nickname) || string.IsNullOrEmpty(ipAddress)) //비어있는 필수 객체 확인하기. + { + Debug.LogError("User ID or Username cannot be null or empty."); + return; + } + + var userData = new Dictionary + { + { "Nickname", nickname }, + { "Language", currentLanguage }, + { "IP", ipAddress } + }; + + m_Reference.Child("users").Child(nickname).SetValueAsync(userData).ContinueWithOnMainThread(task => + { + if (task.IsFaulted) + { + //Debug.LogError("Error writing data: " + task.Exception); + } + else if (task.IsCompleted) + { + //Debug.Log($"Successfully wrote data for User ID: {userId}, Username: {username}"); + } + }); } + + public string GetPublicIP() + { + using (UnityWebRequest webRequest = UnityWebRequest.Get("https://api.ipify.org?format=text")) + { + var operation = webRequest.SendWebRequest(); + + while (!operation.isDone) + { + // Wait until the operation is done + } + + if (webRequest.result == UnityWebRequest.Result.ConnectionError || webRequest.result == UnityWebRequest.Result.ProtocolError) + { + Debug.LogError("Error getting public IP: " + webRequest.error); + return null; + } + else + { + return webRequest.downloadHandler.text; + } + } + } + + public void GetAllUsersData() + { + // "users" 노드에 있는 전체 데이터를 가져옴 + m_Reference.Child("users").GetValueAsync().ContinueWithOnMainThread(task => + { + if (task.IsFaulted) + { + // 에러 처리 + Debug.LogError("Failed to get data: " + task.Exception); + } + else if (task.IsCompleted) + { + DataSnapshot snapshot = task.Result; + + if (snapshot.Exists) + { + Debug.Log("All Users Data:"); + + // users 하위 노드의 데이터를 순회 + foreach (DataSnapshot userSnapshot in snapshot.Children) + { + string userId = userSnapshot.Key; // 예: 유저의 고유 키 + string nickname = userSnapshot.Child("Nickname").Value?.ToString(); + //string round = userSnapshot.Child("Round").Value?.ToString(); + //string gold = userSnapshot.Child("Gold").Value?.ToString(); + //string time = userSnapshot.Child("Time").Value?.ToString(); + //string tries = userSnapshot.Child("Tries").Value?.ToString(); + string language = userSnapshot.Child("Language").Value?.ToString(); + string ipAddress = userSnapshot.Child("IP").Value?.ToString(); + + Debug.Log($"User ID: {userId}, Nickname: {nickname}, Language: {language}, IP: {ipAddress}"); + } + } + else + { + Debug.Log("No users data found."); + } + } + }); + } + } diff --git a/Assets/03.Images/Ui/Tycoon/ClearStemp.png b/Assets/03.Images/Ui/Tycoon/ClearStemp.png new file mode 100644 index 000000000..77dd5fc97 Binary files /dev/null and b/Assets/03.Images/Ui/Tycoon/ClearStemp.png differ diff --git a/Assets/03.Images/Ui/Tycoon/ClearStemp.png.meta b/Assets/03.Images/Ui/Tycoon/ClearStemp.png.meta new file mode 100644 index 000000000..759d783f1 --- /dev/null +++ b/Assets/03.Images/Ui/Tycoon/ClearStemp.png.meta @@ -0,0 +1,143 @@ +fileFormatVersion: 2 +guid: 3f99828f3b98ef441a7ea3d87faec372 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 13 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 0 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 4 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: iOS + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + customData: + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spriteCustomMetadata: + entries: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/04.Materials/Ink.mat b/Assets/04.Materials/Ink.mat index cb7d8b10d..472739dae 100644 --- a/Assets/04.Materials/Ink.mat +++ b/Assets/04.Materials/Ink.mat @@ -99,15 +99,16 @@ Material: - _DetailNormalMapScale: 1 - _DstBlend: 0 - _DstBlendAlpha: 0 + - _Edge: 0 - _EnvironmentReflections: 1 - _GlossMapScale: 0 - _Glossiness: 0 - _GlossyReflections: 0 - _Metallic: 0 - _OcclusionStrength: 1 - - _Opacity: 0.9 + - _Opacity: 0.86 - _Parallax: 0.005 - - _Position: 0.4 + - _Position: 0.41 - _QueueOffset: 0 - _ReceiveShadows: 1 - _ShadeContrast: 0 diff --git a/Assets/08.Spines/Uis/UpgradePopup/CardUpgradeSpine_2.png b/Assets/08.Spines/Uis/UpgradePopup/CardUpgradeSpine_2.png index c6f783a21..4b803d83d 100644 Binary files a/Assets/08.Spines/Uis/UpgradePopup/CardUpgradeSpine_2.png and b/Assets/08.Spines/Uis/UpgradePopup/CardUpgradeSpine_2.png differ diff --git a/Assets/09.Shaders/Ink.shader b/Assets/09.Shaders/Ink.shader index 424e605d6..6394bf7ca 100644 --- a/Assets/09.Shaders/Ink.shader +++ b/Assets/09.Shaders/Ink.shader @@ -124,6 +124,10 @@ Shader "Unlit/Ink" float mappedFloat = lerp(-4.0, 1.5, _Position); uv.x = uv.x * 3.5 + mappedFloat; + + // float uvx = uv.x; + // uv.x = uv.y; + // uv.y = uvx; float timeValue = _CustomTime * _Speed; // 시간 값 diff --git a/Assets/StreamingAssets/GoogleService-Info.plist b/Assets/StreamingAssets/GoogleService-Info.plist index 40e43933c..22050f22e 100644 --- a/Assets/StreamingAssets/GoogleService-Info.plist +++ b/Assets/StreamingAssets/GoogleService-Info.plist @@ -3,17 +3,17 @@ API_KEY - AIzaSyBWnBVlWIKZkrqbT9qylXsgSXcAKuyLnUM + AIzaSyDetshpPepjuBLNC-KRUycsvxBpsdd1bmo GCM_SENDER_ID - 104010899787 + 1011798272954 PLIST_VERSION 1 BUNDLE_ID - com.capers.bluewater + com.capers.ghostpub PROJECT_ID - test001-4ee71 + ghostpub-3d8ef STORAGE_BUCKET - test001-4ee71.firebasestorage.app + ghostpub-3d8ef.firebasestorage.app IS_ADS_ENABLED IS_ANALYTICS_ENABLED @@ -25,8 +25,6 @@ IS_SIGNIN_ENABLED GOOGLE_APP_ID - 1:104010899787:ios:a6481a7a319b2bbdf188ce - DATABASE_URL - https://test001-4ee71-default-rtdb.firebaseio.com + 1:1011798272954:ios:e78a98d97d5c61f6ed0b83 \ No newline at end of file diff --git a/Assets/StreamingAssets/google-services-desktop.json b/Assets/StreamingAssets/google-services-desktop.json index d2e512fdf..f626af5dd 100644 --- a/Assets/StreamingAssets/google-services-desktop.json +++ b/Assets/StreamingAssets/google-services-desktop.json @@ -1,22 +1,21 @@ { "project_info": { - "project_number": "104010899787", - "firebase_url": "https://test001-4ee71-default-rtdb.firebaseio.com", - "project_id": "test001-4ee71", - "storage_bucket": "test001-4ee71.firebasestorage.app" + "project_number": "1011798272954", + "project_id": "ghostpub-3d8ef", + "storage_bucket": "ghostpub-3d8ef.firebasestorage.app" }, "client": [ { "client_info": { - "mobilesdk_app_id": "1:104010899787:android:e10db6217437bb9ff188ce", + "mobilesdk_app_id": "1:1011798272954:android:13468400c1a97543ed0b83", "android_client_info": { - "package_name": "com.capers.bluewater" + "package_name": "com.capers.ghostpub" } }, "oauth_client": [], "api_key": [ { - "current_key": "AIzaSyDPlwgwGpKVRRbqZIUnlfizofXSdS_EW2I" + "current_key": "AIzaSyD6DDYU08Y8HFCL_5FzgWknNA4ZXYojswo" } ], "services": { diff --git a/Assets/StreamingAssets/google-services-desktop.json.meta b/Assets/StreamingAssets/google-services-desktop.json.meta index cb67f1422..b09fe6fb6 100644 --- a/Assets/StreamingAssets/google-services-desktop.json.meta +++ b/Assets/StreamingAssets/google-services-desktop.json.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: c664020d0dfcaf24caef18b69b470af6 +guid: 3e36568f5d2ceb145b201a38285bf221 DefaultImporter: externalObjects: {} userData: diff --git a/Assets/StreamingAssets/google-services.json b/Assets/StreamingAssets/google-services.json index d2e512fdf..f626af5dd 100644 --- a/Assets/StreamingAssets/google-services.json +++ b/Assets/StreamingAssets/google-services.json @@ -1,22 +1,21 @@ { "project_info": { - "project_number": "104010899787", - "firebase_url": "https://test001-4ee71-default-rtdb.firebaseio.com", - "project_id": "test001-4ee71", - "storage_bucket": "test001-4ee71.firebasestorage.app" + "project_number": "1011798272954", + "project_id": "ghostpub-3d8ef", + "storage_bucket": "ghostpub-3d8ef.firebasestorage.app" }, "client": [ { "client_info": { - "mobilesdk_app_id": "1:104010899787:android:e10db6217437bb9ff188ce", + "mobilesdk_app_id": "1:1011798272954:android:13468400c1a97543ed0b83", "android_client_info": { - "package_name": "com.capers.bluewater" + "package_name": "com.capers.ghostpub" } }, "oauth_client": [], "api_key": [ { - "current_key": "AIzaSyDPlwgwGpKVRRbqZIUnlfizofXSdS_EW2I" + "current_key": "AIzaSyD6DDYU08Y8HFCL_5FzgWknNA4ZXYojswo" } ], "services": {