From f7960afbee7dd1d3945adb7a588d370a3806c211 Mon Sep 17 00:00:00 2001 From: Ino Date: Wed, 24 Sep 2025 14:17:45 +0900 Subject: [PATCH] =?UTF-8?q?=EA=B0=80=EC=B1=A0=20=EC=8A=A4=ED=82=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/Scenes/SampleScene.unity | 148 ++++++++++++++++++++++++++++++++ Assets/Scripts/UI/GachaUI.cs | 20 ++++- 2 files changed, 167 insertions(+), 1 deletion(-) diff --git a/Assets/Scenes/SampleScene.unity b/Assets/Scenes/SampleScene.unity index b40643f..98afa37 100644 --- a/Assets/Scenes/SampleScene.unity +++ b/Assets/Scenes/SampleScene.unity @@ -15613,6 +15613,152 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &569690399 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 569690400} + - component: {fileID: 569690404} + - component: {fileID: 569690403} + - component: {fileID: 569690402} + - component: {fileID: 569690401} + m_Layer: 5 + m_Name: btn_skip + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &569690400 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 569690399} + 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: 2013608478} + 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 &569690401 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 569690399} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4848326f7db925d4fbcdb35f789b75f5, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Sound: 0 +--- !u!114 &569690402 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 569690399} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_WrapAround: 0 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 569690403} + m_OnClick: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 2013608479} + m_TargetAssemblyTypeName: GachaUI, Assembly-CSharp + m_MethodName: OnClick_Skip + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 +--- !u!114 &569690403 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 569690399} + 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: 0} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: b0a7567624709ee45872c0e655845f2d, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &569690404 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 569690399} + m_CullTransparentMesh: 1 --- !u!1 &577442247 GameObject: m_ObjectHideFlags: 0 @@ -53281,6 +53427,7 @@ RectTransform: - {fileID: 735827464} - {fileID: 1861711112} - {fileID: 1898552898} + - {fileID: 569690400} m_Father: {fileID: 817765913} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} @@ -53346,6 +53493,7 @@ MonoBehaviour: - {fileID: 1745868383} go_CanEnterLuckyGame: {fileID: 833106249} go_autocharge: {fileID: 1017439549} + go_gachaskip: {fileID: 569690399} m_GachaAnim: {fileID: 1861711113} i_GachaReward: {fileID: 1604177966} --- !u!1 &2017171800 diff --git a/Assets/Scripts/UI/GachaUI.cs b/Assets/Scripts/UI/GachaUI.cs index 89bfc27..155dce5 100644 --- a/Assets/Scripts/UI/GachaUI.cs +++ b/Assets/Scripts/UI/GachaUI.cs @@ -15,7 +15,7 @@ public class GachaUI : uScrollViewMgr public TextMeshProUGUI[] texts_money; // 0 앨범 오픈 재화, 1 챗 코인, 2 가챠 코인 public TextMeshProUGUI[] texts; // 0 럭키 %, 1 광고 충전량, 2 가챠 필요량, 3 충전 시간 public TextMeshProUGUI[] texts_luckypoint; // 획득한 럭키 포인트들 - public GameObject go_CanEnterLuckyGame, go_autocharge; + public GameObject go_CanEnterLuckyGame, go_autocharge, go_gachaskip; public Animation m_GachaAnim; public Image i_GachaReward; @@ -74,6 +74,7 @@ public class GachaUI : uScrollViewMgr } go_CanEnterLuckyGame.SetActive(SaveMgr.Ins.Get_Money(eMoney.Lucky) >= table_GlobalValue.Ins.Get_Float("LuckyPoint")); + go_gachaskip.SetActive(false); Set_Money(); } @@ -171,12 +172,18 @@ public class GachaUI : uScrollViewMgr IEnumerator Co_Gacha() { + go_gachaskip.SetActive(true); DSUtil.InActivateGameObjects(gos_grade); m_GachaAnim.Play("Gacha"); SoundInfo.Ins.Play_OneShot((eSound)Random.Range(12, 14)); yield return new WaitForSeconds(1.75f); + GachaReward(); + } + + void GachaReward() + { SaveMgr.Ins.Add_Money(eMoney.Gacha, -table_GlobalValue.Ins.Get_Int("GachaAmount")); var gradedata = table_gacharateconfig.Ins.Get_RadomData(); DSUtil.InActivateGameObjects(gos_grade, gradedata.n_GachaGrade - 1); @@ -215,4 +222,15 @@ public class GachaUI : uScrollViewMgr GachaAutoRefillTime = InternetTime.Ins.Time.AddSeconds(table_GlobalValue.Ins.Get_Float("GachaAutoRefill_DelayTime")); } + + public void OnClick_Skip() + { + StopAllCoroutines(); + + AnimationState state = m_GachaAnim["Gacha"]; + state.normalizedTime = 0.8f; // 지점 이동 + m_GachaAnim.Sample(); // 즉시 반영 + + GachaReward(); + } } \ No newline at end of file