From d6bdbf582e1a92e563afdb0fe63b6fb952b706f6 Mon Sep 17 00:00:00 2001 From: Ino Date: Sun, 28 Sep 2025 16:41:46 +0900 Subject: [PATCH] =?UTF-8?q?=EB=9F=AD=ED=82=A4=20=EA=B2=8C=EC=9E=84=20sd=20?= =?UTF-8?q?=EC=BA=90=EB=A6=AD=20=EC=A0=9C=EA=B1=B0=20=EB=B0=8F=20=EB=B0=94?= =?UTF-8?q?=EB=8B=A5=20=EC=9E=85=EA=B5=AC=20=EC=83=9D=EC=84=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/Scenes/SampleScene.unity | 287 +++++++++++++++++++++++++++--- Assets/Scripts/Game/Game_Lucky.cs | 13 +- 2 files changed, 263 insertions(+), 37 deletions(-) diff --git a/Assets/Scenes/SampleScene.unity b/Assets/Scenes/SampleScene.unity index 2a0e386..b076557 100644 --- a/Assets/Scenes/SampleScene.unity +++ b/Assets/Scenes/SampleScene.unity @@ -2751,6 +2751,88 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 78161987} m_CullTransparentMesh: 1 +--- !u!1 &85415559 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 85415560} + - component: {fileID: 85415561} + m_Layer: 5 + m_Name: Bot_r + m_TagString: Finish + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &85415560 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 85415559} + 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: 1999037950} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0} + m_AnchorMax: {x: 0.5, y: 0} + m_AnchoredPosition: {x: 2756, y: -25} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!61 &85415561 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 85415559} + m_Enabled: 1 + serializedVersion: 3 + m_Density: 1 + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_ForceSendLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ForceReceiveLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ContactCaptureLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_CallbackLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_IsTrigger: 0 + m_UsedByEffector: 0 + m_CompositeOperation: 0 + m_CompositeOrder: 0 + m_Offset: {x: 0, y: 0} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0, y: 0} + oldSize: {x: 0, y: 0} + newSize: {x: 0, y: 0} + adaptiveTilingThreshold: 0 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + m_Size: {x: 5000, y: 100} + m_EdgeRadius: 0 --- !u!1 &85747003 GameObject: m_ObjectHideFlags: 0 @@ -4443,7 +4525,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: -66.37494} + m_AnchoredPosition: {x: 0, y: -66.375} m_SizeDelta: {x: 0, y: 132.85} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &132953337 @@ -15595,7 +15677,7 @@ GameObject: - component: {fileID: 420248621} - component: {fileID: 420248622} m_Layer: 5 - m_Name: Bot + m_Name: Bot_l m_TagString: Finish m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -15617,7 +15699,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} - m_AnchoredPosition: {x: 0, y: -25} + m_AnchoredPosition: {x: -2756, y: -25} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!61 &420248622 @@ -24105,6 +24187,88 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 618695920} m_CullTransparentMesh: 1 +--- !u!1 &623495019 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 623495020} + - component: {fileID: 623495021} + m_Layer: 5 + m_Name: EnterBlock_l + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &623495020 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 623495019} + 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: 1999037950} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0} + m_AnchorMax: {x: 0.5, y: 0} + m_AnchoredPosition: {x: -275, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!61 &623495021 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 623495019} + m_Enabled: 1 + serializedVersion: 3 + m_Density: 1 + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_ForceSendLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ForceReceiveLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ContactCaptureLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_CallbackLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_IsTrigger: 0 + m_UsedByEffector: 0 + m_CompositeOperation: 0 + m_CompositeOrder: 0 + m_Offset: {x: 0, y: 0} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0, y: 0} + oldSize: {x: 0, y: 0} + newSize: {x: 0, y: 0} + adaptiveTilingThreshold: 0 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + m_Size: {x: 50, y: 100} + m_EdgeRadius: 0 --- !u!1 &641259519 GameObject: m_ObjectHideFlags: 0 @@ -41715,6 +41879,88 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1154232205} m_CullTransparentMesh: 1 +--- !u!1 &1158904411 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1158904412} + - component: {fileID: 1158904413} + m_Layer: 5 + m_Name: EnterBlock_r + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1158904412 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1158904411} + 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: 1999037950} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0} + m_AnchorMax: {x: 0.5, y: 0} + m_AnchoredPosition: {x: 275, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!61 &1158904413 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1158904411} + m_Enabled: 1 + serializedVersion: 3 + m_Density: 1 + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_ForceSendLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ForceReceiveLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ContactCaptureLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_CallbackLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_IsTrigger: 0 + m_UsedByEffector: 0 + m_CompositeOperation: 0 + m_CompositeOrder: 0 + m_Offset: {x: 0, y: 0} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0, y: 0} + oldSize: {x: 0, y: 0} + newSize: {x: 0, y: 0} + adaptiveTilingThreshold: 0 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + m_Size: {x: 50, y: 100} + m_EdgeRadius: 0 --- !u!1 &1161098095 GameObject: m_ObjectHideFlags: 0 @@ -45164,7 +45410,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 0.5} m_AnchorMax: {x: 1, y: 0.5} - m_AnchoredPosition: {x: -161.6, y: 2.8} + m_AnchoredPosition: {x: -161.59998, y: 2.8} m_SizeDelta: {x: 270, y: 97} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1249156560 @@ -45561,7 +45807,6 @@ MonoBehaviour: m_LuckyGameCupCounter: {fileID: 1957117012} m_Game_Lucky_Result: {fileID: 1534428863} i_girl: {fileID: 314847187} - i_girlsd: {fileID: 1950932325} i_refillbtn: {fileID: 805181808} gos_boobs: - {fileID: 1078095979} @@ -72400,8 +72645,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} - m_AnchoredPosition: {x: 0, y: 100} - m_SizeDelta: {x: 200, y: 200} + m_AnchoredPosition: {x: 0, y: -25} + m_SizeDelta: {x: 500, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1950932325 MonoBehaviour: @@ -72423,8 +72668,8 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 0} - m_Type: 0 + m_Sprite: {fileID: 21300000, guid: 9697034aebea7c64189648fe6a3b0676, type: 3} + m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -72441,8 +72686,8 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1950932323} m_CullTransparentMesh: 1 ---- !u!60 &1950932327 -PolygonCollider2D: +--- !u!61 &1950932327 +BoxCollider2D: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -72485,21 +72730,8 @@ PolygonCollider2D: drawMode: 0 adaptiveTiling: 0 m_AutoTiling: 0 - m_Points: - m_Paths: - - - {x: -49.438667, y: -1.4358826} - - {x: -50.945236, y: -63.112606} - - {x: -26.692078, y: -44.812016} - - {x: -28.843681, y: -94.35721} - - {x: 21.81721, y: -96.96411} - - {x: 37.549072, y: -36.346367} - - {x: 25.689781, y: -4.5738525} - - {x: 67.72252, y: 13.039583} - - {x: 41.939873, y: 80.82358} - - {x: -2.8452, y: 94.754974} - - {x: -40.045727, y: 81.96294} - - {x: -66.771454, y: 24.388128} - m_UseDelaunayMesh: 0 + m_Size: {x: 500, y: 100} + m_EdgeRadius: 0 --- !u!1 &1957117007 GameObject: m_ObjectHideFlags: 0 @@ -74295,6 +74527,9 @@ RectTransform: - {fileID: 993386006} - {fileID: 1626145304} - {fileID: 420248621} + - {fileID: 85415560} + - {fileID: 623495020} + - {fileID: 1158904412} m_Father: {fileID: 1257193656} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} diff --git a/Assets/Scripts/Game/Game_Lucky.cs b/Assets/Scripts/Game/Game_Lucky.cs index 1e881ea..ce6fae7 100644 --- a/Assets/Scripts/Game/Game_Lucky.cs +++ b/Assets/Scripts/Game/Game_Lucky.cs @@ -10,7 +10,7 @@ public class Game_Lucky : MonoBehaviour { public LuckyGameCupCounter m_LuckyGameCupCounter; public Game_Lucky_Result m_Game_Lucky_Result; - public Image i_girl, i_girlsd, i_refillbtn; + public Image i_girl, i_refillbtn; public GameObject[] gos_boobs; public TextMeshProUGUI[] texts; // 0 시간, 1 획득 재화, 2 컵안 오브젝트 갯수, 3 리필 횟수, 4 리필 갯수 public GameObject go_dropobj; // 떨어질 공 prefab @@ -37,7 +37,7 @@ public class Game_Lucky : MonoBehaviour ProtectedInt32 TotalBubbleAmount = 50, m_RefillCount = 0; int CupInAmount = 0; // 컵 안에 있는 오브젝트 갯수 - AsyncOperationHandle m_Handle, m_HandleSD; + AsyncOperationHandle m_Handle; int curGirl; private void Awake() @@ -80,13 +80,6 @@ public class Game_Lucky : MonoBehaviour i_girl.enabled = true; i_girl.sprite = handle.Result; }); - i_girlsd.enabled = false; - AddrResourceMgr.Ins.LoadObject($"Girl_Game/{curGirl}sd.png", handle => - { - m_HandleSD = handle; - i_girlsd.enabled = true; - i_girlsd.sprite = handle.Result; - }); m_RefillCount = SaveMgr.Ins.Get_LuckyGameRefill(); m_RefillCount.Obfuscate(); @@ -181,8 +174,6 @@ public class Game_Lucky : MonoBehaviour { AddrResourceMgr.Ins.Relese(m_Handle); i_girl.sprite = null; - AddrResourceMgr.Ins.Relese(m_HandleSD); - i_girlsd.sprite = null; gameObject.SetActive(false); }