diff --git a/Assets/AddressableAssetsData/Android/addressables_content_state.bin b/Assets/AddressableAssetsData/Android/addressables_content_state.bin index 56b1f1a..a9f8d88 100644 Binary files a/Assets/AddressableAssetsData/Android/addressables_content_state.bin and b/Assets/AddressableAssetsData/Android/addressables_content_state.bin differ diff --git a/Assets/ResWork/UI_Image/Shop/shop_money_icon_2_shop.png b/Assets/ResWork/UI_Image/Shop/shop_money_icon_2_shop.png index 39d34bd..0e68dda 100644 Binary files a/Assets/ResWork/UI_Image/Shop/shop_money_icon_2_shop.png and b/Assets/ResWork/UI_Image/Shop/shop_money_icon_2_shop.png differ diff --git a/Assets/ResWork/UI_Image/Shop/shop_money_icon_3_shop.png b/Assets/ResWork/UI_Image/Shop/shop_money_icon_3_shop.png index 64f038e..6d120ed 100644 Binary files a/Assets/ResWork/UI_Image/Shop/shop_money_icon_3_shop.png and b/Assets/ResWork/UI_Image/Shop/shop_money_icon_3_shop.png differ diff --git a/Assets/Scenes/SampleScene.unity b/Assets/Scenes/SampleScene.unity index c6df52e..79625b3 100644 --- a/Assets/Scenes/SampleScene.unity +++ b/Assets/Scenes/SampleScene.unity @@ -8707,6 +8707,11 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!1 &198690468 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 6529096894258932369, guid: b92c7bec9741ee44b897051958ae6f1b, type: 3} + m_PrefabInstance: {fileID: 4758099844346040569} + m_PrefabAsset: {fileID: 0} --- !u!1 &199847669 GameObject: m_ObjectHideFlags: 0 @@ -12965,6 +12970,11 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 307250822} m_CullTransparentMesh: 1 +--- !u!1 &310351291 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 7602269929649829496, guid: b92c7bec9741ee44b897051958ae6f1b, type: 3} + m_PrefabInstance: {fileID: 4758099844346040569} + m_PrefabAsset: {fileID: 0} --- !u!1 &310836910 GameObject: m_ObjectHideFlags: 0 @@ -17128,6 +17138,11 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 396100351} m_CullTransparentMesh: 1 +--- !u!1 &399265345 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 8283837771190577381, guid: b92c7bec9741ee44b897051958ae6f1b, type: 3} + m_PrefabInstance: {fileID: 4758099844346040569} + m_PrefabAsset: {fileID: 0} --- !u!1 &399951204 GameObject: m_ObjectHideFlags: 0 @@ -24111,6 +24126,11 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 540368213} m_CullTransparentMesh: 1 +--- !u!1 &542812195 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 2658902584104637044, guid: b92c7bec9741ee44b897051958ae6f1b, type: 3} + m_PrefabInstance: {fileID: 4758099844346040569} + m_PrefabAsset: {fileID: 0} --- !u!1 &548977663 GameObject: m_ObjectHideFlags: 0 @@ -35396,6 +35416,11 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 817824014} m_CullTransparentMesh: 1 +--- !u!1 &818723650 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 3574105332676644573, guid: b92c7bec9741ee44b897051958ae6f1b, type: 3} + m_PrefabInstance: {fileID: 4758099844346040569} + m_PrefabAsset: {fileID: 0} --- !u!1 &821478951 GameObject: m_ObjectHideFlags: 0 @@ -52446,6 +52471,11 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1154232205} m_CullTransparentMesh: 1 +--- !u!1 &1155190363 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 8874288789284191592, guid: b92c7bec9741ee44b897051958ae6f1b, type: 3} + m_PrefabInstance: {fileID: 4758099844346040569} + m_PrefabAsset: {fileID: 0} --- !u!1 &1158904411 GameObject: m_ObjectHideFlags: 0 @@ -69445,6 +69475,38 @@ PrefabInstance: propertyPath: m_Name value: HorseRushCanvas objectReference: {fileID: 0} + - target: {fileID: 6885356246806688224, guid: b2467f2b599a7fb4f842dc956284d743, type: 3} + propertyPath: 'gos_sexy.Array.data[0]' + value: + objectReference: {fileID: 818723650} + - target: {fileID: 6885356246806688224, guid: b2467f2b599a7fb4f842dc956284d743, type: 3} + propertyPath: 'gos_sexy.Array.data[1]' + value: + objectReference: {fileID: 198690468} + - target: {fileID: 6885356246806688224, guid: b2467f2b599a7fb4f842dc956284d743, type: 3} + propertyPath: 'gos_sexy.Array.data[2]' + value: + objectReference: {fileID: 1642727186} + - target: {fileID: 6885356246806688224, guid: b2467f2b599a7fb4f842dc956284d743, type: 3} + propertyPath: 'gos_sexy.Array.data[3]' + value: + objectReference: {fileID: 310351291} + - target: {fileID: 6885356246806688224, guid: b2467f2b599a7fb4f842dc956284d743, type: 3} + propertyPath: 'gos_sexy.Array.data[4]' + value: + objectReference: {fileID: 1600494699} + - target: {fileID: 6885356246806688224, guid: b2467f2b599a7fb4f842dc956284d743, type: 3} + propertyPath: 'gos_sexy.Array.data[5]' + value: + objectReference: {fileID: 399265345} + - target: {fileID: 6885356246806688224, guid: b2467f2b599a7fb4f842dc956284d743, type: 3} + propertyPath: 'gos_sexy.Array.data[6]' + value: + objectReference: {fileID: 542812195} + - target: {fileID: 6885356246806688224, guid: b2467f2b599a7fb4f842dc956284d743, type: 3} + propertyPath: 'gos_sexy.Array.data[7]' + value: + objectReference: {fileID: 1155190363} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] @@ -70903,6 +70965,11 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1600216656} m_CullTransparentMesh: 1 +--- !u!1 &1600494699 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 4601400811695666497, guid: b92c7bec9741ee44b897051958ae6f1b, type: 3} + m_PrefabInstance: {fileID: 4758099844346040569} + m_PrefabAsset: {fileID: 0} --- !u!1 &1601110501 GameObject: m_ObjectHideFlags: 0 @@ -73345,6 +73412,11 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1639525054} m_CullTransparentMesh: 1 +--- !u!1 &1642727186 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 8131019705385683693, guid: b92c7bec9741ee44b897051958ae6f1b, type: 3} + m_PrefabInstance: {fileID: 4758099844346040569} + m_PrefabAsset: {fileID: 0} --- !u!1 &1644731137 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/UI/AlbumCard.cs b/Assets/Scripts/UI/AlbumCard.cs index 572a36c..e8639f8 100644 --- a/Assets/Scripts/UI/AlbumCard.cs +++ b/Assets/Scripts/UI/AlbumCard.cs @@ -1,5 +1,4 @@ using TMPro; -using TreeEditor; using UnityEngine; using UnityEngine.UI; diff --git a/Assets/Scripts/UI/GachaUI.cs b/Assets/Scripts/UI/GachaUI.cs index db33b30..94bcb67 100644 --- a/Assets/Scripts/UI/GachaUI.cs +++ b/Assets/Scripts/UI/GachaUI.cs @@ -377,9 +377,12 @@ public class GachaUI : uScrollViewMgr videoPlayer.Pause(); videoPlayer.time = 0; // 혹시 시간이 흘렀다면 0초로 강제 고정 - yield return null; - yield return null; - end?.Invoke(); + if (end != null) + { + for (int i = 0; i < 3; i++) + yield return null; + end?.Invoke(); + } } // 2. 외부에서 이 함수를 호출하여 재생 시작