diff --git a/Assets/ResWork/UI_Prefab/LuckyPointCard.prefab b/Assets/ResWork/UI_Prefab/LuckyPointCard.prefab index 60efac0..7cd3175 100644 --- a/Assets/ResWork/UI_Prefab/LuckyPointCard.prefab +++ b/Assets/ResWork/UI_Prefab/LuckyPointCard.prefab @@ -30,7 +30,8 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 1 - m_Children: [] + m_Children: + - {fileID: 3612033025370440532} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} @@ -159,3 +160,38 @@ Animator: m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorStateOnDisable: 0 m_WriteDefaultValuesOnDisable: 0 +--- !u!1 &6169393250766910300 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3612033025370440532} + m_Layer: 5 + m_Name: GameObject + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &3612033025370440532 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6169393250766910300} + 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: 1513009740226389320} + 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: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} diff --git a/Assets/Scripts/AttachToGameObject/SaveMgr.cs b/Assets/Scripts/AttachToGameObject/SaveMgr.cs index e5377ee..aae2f85 100644 --- a/Assets/Scripts/AttachToGameObject/SaveMgr.cs +++ b/Assets/Scripts/AttachToGameObject/SaveMgr.cs @@ -26,6 +26,8 @@ public class SaveMgr : MonoBehaviourSingletonTemplate SoundInfo.Ins.Play_OneShot(eSound.s012_Title); while (!LobbyUI.Ins) yield return null; LobbyUI.Ins.Set_Money(); + + Open_Album(table_album.Ins.Get_SpecialAlbum(1, eCollectionMethod.FullCollection)); } public bool isLoad() { return m_SaveData != null; } diff --git a/Assets/Scripts/UI/GachaUI.cs b/Assets/Scripts/UI/GachaUI.cs index f4e7f4e..79ef0a1 100644 --- a/Assets/Scripts/UI/GachaUI.cs +++ b/Assets/Scripts/UI/GachaUI.cs @@ -63,7 +63,11 @@ public class GachaUI : uScrollViewMgr SoundInfo.Ins.Play_BGM(eBGM.b005_Gacha); DSUtil.InActivateGameObjects(gos_grade); for (int i = 0; i < texts_luckypoint.Length; i++) - texts_luckypoint[i].alpha = 0f; + { + texts_luckypoint[i].GetComponent().speed = 0f; + texts_luckypoint[i].text = ""; + texts_luckypoint[i].transform.GetChild(0).gameObject.SetActive(false); + } Set_UI(false); Init_GachaAnim(); Set_Video(); @@ -272,9 +276,10 @@ public class GachaUI : uScrollViewMgr if (reward.Item3 > 0) for (int i = 0; i < texts_luckypoint.Length; i++) { - if (texts_luckypoint[i].alpha <= 0f) + if (!texts_luckypoint[i].transform.GetChild(0).gameObject.activeInHierarchy) { texts_luckypoint[i].text = $"+{reward.Item3}"; + texts_luckypoint[i].GetComponent().speed = 1f; texts_luckypoint[i].GetComponent().Play("Gacha_LuckyPoint"); break; }