diff --git a/Assets/ResWork/GameVFX Collection Vol3/Prefabs/FX_Summoning Circle.prefab b/Assets/ResWork/GameVFX Collection Vol3/Prefabs/FX_Summoning Circle.prefab index 46cede3..a89c203 100644 --- a/Assets/ResWork/GameVFX Collection Vol3/Prefabs/FX_Summoning Circle.prefab +++ b/Assets/ResWork/GameVFX Collection Vol3/Prefabs/FX_Summoning Circle.prefab @@ -9790,7 +9790,7 @@ ParticleSystem: ringBufferMode: 0 ringBufferLoopRange: {x: 0, y: 1} emitterVelocityMode: 0 - looping: 0 + looping: 1 prewarm: 0 playOnAwake: 1 useUnscaledTime: 0 @@ -19678,7 +19678,7 @@ ParticleSystem: ringBufferMode: 0 ringBufferLoopRange: {x: 0, y: 1} emitterVelocityMode: 0 - looping: 0 + looping: 1 prewarm: 0 playOnAwake: 1 useUnscaledTime: 0 diff --git a/Assets/ResWork/UI_Image/Common/Yellow btn.png.meta b/Assets/ResWork/UI_Image/Common/Yellow btn.png.meta index 7632686..d9e7ec9 100644 --- a/Assets/ResWork/UI_Image/Common/Yellow btn.png.meta +++ b/Assets/ResWork/UI_Image/Common/Yellow btn.png.meta @@ -52,7 +52,7 @@ TextureImporter: alignment: 0 spritePivot: {x: 0.5, y: 0.5} spritePixelsToUnits: 100 - spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteBorder: {x: 295, y: 0, z: 122, w: 0} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 alphaIsTransparency: 1 @@ -134,7 +134,7 @@ TextureImporter: width: 417 height: 158 alignment: 0 - pivot: {x: 0, y: 0} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} customData: outline: [] @@ -152,7 +152,7 @@ TextureImporter: physicsShape: [] bones: [] spriteID: 5e97eb03825dee720800000000000000 - internalID: 0 + internalID: 1537655665 vertices: [] indices: edges: [] diff --git a/Assets/ResWork/UI_Prefab/ProfileCard.prefab b/Assets/ResWork/UI_Prefab/ProfileCard.prefab index 107a16d..38f36b9 100644 --- a/Assets/ResWork/UI_Prefab/ProfileCard.prefab +++ b/Assets/ResWork/UI_Prefab/ProfileCard.prefab @@ -1445,6 +1445,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 5833798987606906032} + - {fileID: 7727837229679509447} m_Father: {fileID: 2198343314357404905} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0} @@ -1481,7 +1482,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_Sprite: {fileID: 21300000, guid: d51802e044e2918449e2e316748b7b4e, type: 3} - m_Type: 0 + m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -2205,6 +2206,7 @@ MonoBehaviour: go_albumbtn: {fileID: 6118212189904897713} go_chatbtn: {fileID: 6488644166046883144} go_changegirl: {fileID: 687796067331381646} + go_openeffect: {fileID: 614239235186920742} rect: {fileID: 0} mat_Gray: {fileID: 2100000, guid: 7701c15f96b443d408ac83222c9b869a, type: 2} --- !u!1 &8512964498684640329 @@ -2523,3 +2525,86 @@ MonoBehaviour: m_hasFontAssetChanged: 0 m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!1001 &911746740214713128 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 5404220870936619555} + m_Modifications: + - target: {fileID: 297549287556040206, guid: 924a1f32a2e1e4b42bc83b849ac29332, type: 3} + propertyPath: m_Name + value: FX_Summoning Circle + objectReference: {fileID: 0} + - target: {fileID: 7465252739535844591, guid: 924a1f32a2e1e4b42bc83b849ac29332, type: 3} + propertyPath: m_LocalScale.x + value: 70 + objectReference: {fileID: 0} + - target: {fileID: 7465252739535844591, guid: 924a1f32a2e1e4b42bc83b849ac29332, type: 3} + propertyPath: m_LocalScale.y + value: 70 + objectReference: {fileID: 0} + - target: {fileID: 7465252739535844591, guid: 924a1f32a2e1e4b42bc83b849ac29332, type: 3} + propertyPath: m_LocalScale.z + value: 70 + objectReference: {fileID: 0} + - target: {fileID: 7465252739535844591, guid: 924a1f32a2e1e4b42bc83b849ac29332, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7465252739535844591, guid: 924a1f32a2e1e4b42bc83b849ac29332, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7465252739535844591, guid: 924a1f32a2e1e4b42bc83b849ac29332, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7465252739535844591, guid: 924a1f32a2e1e4b42bc83b849ac29332, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7465252739535844591, guid: 924a1f32a2e1e4b42bc83b849ac29332, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7465252739535844591, guid: 924a1f32a2e1e4b42bc83b849ac29332, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7465252739535844591, guid: 924a1f32a2e1e4b42bc83b849ac29332, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7465252739535844591, guid: 924a1f32a2e1e4b42bc83b849ac29332, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7465252739535844591, guid: 924a1f32a2e1e4b42bc83b849ac29332, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7465252739535844591, guid: 924a1f32a2e1e4b42bc83b849ac29332, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7465252739535844591, guid: 924a1f32a2e1e4b42bc83b849ac29332, type: 3} + propertyPath: m_ConstrainProportionsScale + value: 1 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 924a1f32a2e1e4b42bc83b849ac29332, type: 3} +--- !u!1 &614239235186920742 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 297549287556040206, guid: 924a1f32a2e1e4b42bc83b849ac29332, type: 3} + m_PrefabInstance: {fileID: 911746740214713128} + m_PrefabAsset: {fileID: 0} +--- !u!4 &7727837229679509447 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 7465252739535844591, guid: 924a1f32a2e1e4b42bc83b849ac29332, type: 3} + m_PrefabInstance: {fileID: 911746740214713128} + m_PrefabAsset: {fileID: 0} diff --git a/Assets/Scripts/UI/AlbumCard.cs b/Assets/Scripts/UI/AlbumCard.cs index 9390882..81a30ae 100644 --- a/Assets/Scripts/UI/AlbumCard.cs +++ b/Assets/Scripts/UI/AlbumCard.cs @@ -47,6 +47,7 @@ public class AlbumCard : CardBase SaveMgr.Ins.Open_Image(); SaveMgr.Ins.Save(); + LobbyUI.Ins.m_LobbyCenterProfileUI.Set(); LobbyUI.Ins.m_AlbumUI.Set_UI(); LobbyUI.Ins.m_ToastUI.Set("열린 앨범을 감상해 보세요."); } diff --git a/Assets/Scripts/UI/LobbyUI.cs b/Assets/Scripts/UI/LobbyUI.cs index f030cdb..04c81bf 100644 --- a/Assets/Scripts/UI/LobbyUI.cs +++ b/Assets/Scripts/UI/LobbyUI.cs @@ -91,6 +91,8 @@ public class LobbyUI : MonoBehaviourSingletonTemplate Go_Home(); m_AlbumUI.Set(); DSUtil.InActivateGameObjects(gos_homeBot); + + Btn_Init(); images_botbtn[0].sprite = UIAtlasMgr.Ins.Get_Sprite("btn x"); (images_botbtn[0].transform as RectTransform).sizeDelta = new Vector2(91, 91); } @@ -98,8 +100,7 @@ public class LobbyUI : MonoBehaviourSingletonTemplate { CurMenu = 2; Go_Home(); - images_botbtn[0].sprite = UIAtlasMgr.Ins.Get_Sprite("album icon"); - (images_botbtn[0].transform as RectTransform).sizeDelta = new Vector2(91, 83); + Btn_Init(); } break; case "btn_home": @@ -107,11 +108,7 @@ public class LobbyUI : MonoBehaviourSingletonTemplate { CurMenu = 2; Go_Home(); - - images_botbtn[0].sprite = UIAtlasMgr.Ins.Get_Sprite("album icon"); - (images_botbtn[0].transform as RectTransform).sizeDelta = new Vector2(91, 83); - images_botbtn[1].sprite = UIAtlasMgr.Ins.Get_Sprite("shop icon"); - (images_botbtn[1].transform as RectTransform).sizeDelta = new Vector2(91, 83); + Btn_Init(); } break; case "btn_gacha": m_GachaUI.Set(); break; @@ -122,6 +119,8 @@ public class LobbyUI : MonoBehaviourSingletonTemplate Go_Home(); go_shop.SetActive(true); DSUtil.InActivateGameObjects(gos_homeBot); + + Btn_Init(); images_botbtn[1].sprite = UIAtlasMgr.Ins.Get_Sprite("btn x"); (images_botbtn[1].transform as RectTransform).sizeDelta = new Vector2(91, 91); } @@ -129,8 +128,7 @@ public class LobbyUI : MonoBehaviourSingletonTemplate { CurMenu = 2; Go_Home(); - images_botbtn[1].sprite = UIAtlasMgr.Ins.Get_Sprite("shop icon"); - (images_botbtn[1].transform as RectTransform).sizeDelta = new Vector2(91, 83); + Btn_Init(); } break; @@ -147,6 +145,14 @@ public class LobbyUI : MonoBehaviourSingletonTemplate } } + void Btn_Init() + { + images_botbtn[0].sprite = UIAtlasMgr.Ins.Get_Sprite("album icon"); + (images_botbtn[0].transform as RectTransform).sizeDelta = new Vector2(91, 83); + images_botbtn[1].sprite = UIAtlasMgr.Ins.Get_Sprite("shop icon"); + (images_botbtn[1].transform as RectTransform).sizeDelta = new Vector2(91, 83); + } + public void MiniGameResult() { SaveMgr.Ins.Add_Money(eMoney.MiniGameHP, -1); diff --git a/Assets/Scripts/UI/ProfileCard.cs b/Assets/Scripts/UI/ProfileCard.cs index 5d378a7..a860a5f 100644 --- a/Assets/Scripts/UI/ProfileCard.cs +++ b/Assets/Scripts/UI/ProfileCard.cs @@ -7,7 +7,7 @@ public class ProfileCard : MonoBehaviour { public Image i_girl, i_openbtn; public TextMeshProUGUI[] texts; // 0 이름, 1 카운트 - public GameObject go_openbtn, go_viewbtn, go_albumbtn, go_chatbtn, go_changegirl; + public GameObject go_openbtn, go_viewbtn, go_albumbtn, go_chatbtn, go_changegirl, go_openeffect; public RectTransform rect; public Material mat_Gray; @@ -46,7 +46,8 @@ public class ProfileCard : MonoBehaviour texts[1].text = $"{count}/{maxcount}"; i_girl.material = count == 0 ? mat_Gray : null; go_openbtn.SetActive(count == 0); - i_openbtn.sprite = UIAtlasMgr.Ins.Get_Sprite(CanOpen() ? "black btn" : "gray btn"); + i_openbtn.sprite = UIAtlasMgr.Ins.Get_Sprite(CanOpen() ? "Yellow btn" : "gray btn"); + go_openeffect.SetActive(CanOpen()); go_viewbtn.SetActive(count == 0); go_albumbtn.SetActive(count > 0); go_chatbtn.SetActive(count > 0);