From 968063277a77397eeaada400736efbb4e0077588 Mon Sep 17 00:00:00 2001 From: Ino Date: Sun, 29 Dec 2024 09:15:03 +0900 Subject: [PATCH] =?UTF-8?q?=EB=A1=9C=EB=B9=84ui=20=EC=B1=84=ED=8C=85=20?= =?UTF-8?q?=EC=A0=9C=EC=99=B8=20=EC=99=84=EB=A3=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AssetGroups/MainUI.asset | 8 +- Assets/ResWork/UI/NewRes/stat_dex.png | Bin 606 -> 0 bytes Assets/ResWork/UI/NewRes/stat_dex.png.meta | 140 - Assets/ResWork/UI/NewRes/stat_int.png | Bin 678 -> 0 bytes Assets/ResWork/UI/NewRes/stat_int.png.meta | 140 - Assets/ResWork/UI/NewRes/stat_str.png | Bin 765 -> 0 bytes Assets/ResWork/UI/NewRes/stat_str.png.meta | 140 - .../ResWork/UI/Title/TitleAtlas.spriteatlas | 79 - .../UI/Title/TitleAtlas.spriteatlas.meta | 8 - .../ResWork/UI/Title/TitleAtlas.spriteatlasv2 | 15 + .../UI/Title/TitleAtlas.spriteatlasv2.meta | 43 + .../ResWork/UIPrefabs/Common/MoneyForm.prefab | 23 +- .../UIPrefabs/InGame/MainStatCard.prefab | 9 +- Assets/Res_Addr/MainUI/NewGameUI.prefab | 3628 ++++++++--------- Assets/Res_Addr/MainUI/UIAtlas.spriteatlas | 2465 ----------- .../Res_Addr/MainUI/UIAtlas.spriteatlas.meta | 8 - Assets/Res_Addr/MainUI/UIAtlas.spriteatlasv2 | 16 + .../MainUI/UIAtlas.spriteatlasv2.meta | 43 + Assets/Script/Mgr/UIAtlasMgr.cs | 8 +- Assets/Script/UI/Common/BotMenu.cs | 7 +- Assets/Script/UI/Common/GuideQuestUI.cs | 7 +- Assets/Script/UI/Common/MainStatCard.cs | 5 +- Assets/Script/UI/Stage/MyInfoUI.cs | 5 +- 23 files changed, 1805 insertions(+), 4992 deletions(-) delete mode 100644 Assets/ResWork/UI/NewRes/stat_dex.png delete mode 100644 Assets/ResWork/UI/NewRes/stat_dex.png.meta delete mode 100644 Assets/ResWork/UI/NewRes/stat_int.png delete mode 100644 Assets/ResWork/UI/NewRes/stat_int.png.meta delete mode 100644 Assets/ResWork/UI/NewRes/stat_str.png delete mode 100644 Assets/ResWork/UI/NewRes/stat_str.png.meta delete mode 100644 Assets/ResWork/UI/Title/TitleAtlas.spriteatlas delete mode 100644 Assets/ResWork/UI/Title/TitleAtlas.spriteatlas.meta create mode 100644 Assets/ResWork/UI/Title/TitleAtlas.spriteatlasv2 create mode 100644 Assets/ResWork/UI/Title/TitleAtlas.spriteatlasv2.meta delete mode 100644 Assets/Res_Addr/MainUI/UIAtlas.spriteatlas delete mode 100644 Assets/Res_Addr/MainUI/UIAtlas.spriteatlas.meta create mode 100644 Assets/Res_Addr/MainUI/UIAtlas.spriteatlasv2 create mode 100644 Assets/Res_Addr/MainUI/UIAtlas.spriteatlasv2.meta diff --git a/Assets/AddressableAssetsData/AssetGroups/MainUI.asset b/Assets/AddressableAssetsData/AssetGroups/MainUI.asset index 5279d0aec..19e6ce4eb 100644 --- a/Assets/AddressableAssetsData/AssetGroups/MainUI.asset +++ b/Assets/AddressableAssetsData/AssetGroups/MainUI.asset @@ -17,14 +17,14 @@ MonoBehaviour: m_SerializedData: [] m_GUID: 358913803dca70d418806466f5e32fa6 m_SerializeEntries: - - m_GUID: afd138c6f06211a40a2f5def5d969df1 - m_Address: Assets/Res_Addr/MainUI/NewGameUI.prefab + - m_GUID: 2a60ae19849d36c4c8dd4f71b1acff4f + m_Address: Assets/Res_Addr/MainUI/UIAtlas.spriteatlasv2 m_ReadOnly: 0 m_SerializedLabels: - mainui FlaggedDuringContentUpdateRestriction: 0 - - m_GUID: 4b88695012158544cabd8fa1c41e947b - m_Address: Assets/Res_Addr/MainUI/UIAtlas.spriteatlas + - m_GUID: afd138c6f06211a40a2f5def5d969df1 + m_Address: Assets/Res_Addr/MainUI/NewGameUI.prefab m_ReadOnly: 0 m_SerializedLabels: - mainui diff --git a/Assets/ResWork/UI/NewRes/stat_dex.png b/Assets/ResWork/UI/NewRes/stat_dex.png deleted file mode 100644 index b351ccbff546c8c80637a04b9972284f11ae0cdd..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 606 zcmeAS@N?(olHy`uVBq!ia0vp^DIm!lvI6;>1s;*b3=DjSL74G){tBRW#?PKEjv*CsZ*Lv+J8U4paIx+G|K|xFBCbx3*F|ga4@1o;;_U-)ieup1b}tRJ4axg4;kWLFYh3!$yW=#$!wnfeR1as%~$4 zJp1YUlhNhZLbaMV%{csX$M(`=2J0>^E#+A}J!1c!-(F38EpMz}r?0r=v+I3Z!^Vbr z>0$RLH|;CB)VT)%dB+Qr=Tqq3_#UKq(ZD`c)w zVg9F9B1#NDN`*l2P zkLkkKl9H=GOPEdbT9>|NtGB4_@ehh&cN)%EwdH5)^6Nhjp8UEdZEkMeTz}mqn%5?| z%5C{K`^oXMRcW`9eGuhY@%>;LB!F&?4>I|r>%^*_^dDVj8Xj5O-D`zKXJ@i v^Jw99k;Zq2lGh&T4#F@DRUmBZ_1DsG{m&Pv{Lz^POcM;Au6{1-oD!M!lvI6;>1s;*b3=DjSL74G){tBRWCTmX@$B>G+w{sG+TMPtT&j0)W|BbGTOOn5F zn)%GBmGM~%Gd|6cJ#?@%^7>chTR(2sb+M^%J8WXWNj$50wL#}}*;nc5t#A21?Tp^C zMoeG)i_ZHW8Pju*^(8LXG_#p3y0A?vGH+8ru=x3}w^UZHi4MLHoRMl-a&4_9$Nk+u zAI)ELPC9JUib&vFj42zAtR5;t`QMz z-8%mwBzsOi>Y3`OsO`Fj=hC@X>W^42oLn^5F?rt_M&lP>nbc07x)j!Wy)2ByI5l+R zro==&9p{rwGt^$otbTi{d4X2QCI*d^*08CM&ra28u-sH6yS_~A1lQVc0dA+gX01FF z5V_J<(m8dmy52<|sbVfW%}J~Vkzwn^f;TZdJMAU1ZsDeql8mQ^Lc}^>=`=WQTJ`2e zq{;QdEe1|u-&Wm9lsqir)Q7D9dCqyNOg(y%BeGXH?5||vjyb7?ef{F| zHq8tDE%<3x`Q)qls}8);{&4%d@b=o6{>Mg6T=%Y-Uks7q+jKAXmAliVuVH^u_ZBg5 z@7=UYvSy>^VsEkBXx6=(*DXFAIc?I{$zEr7`%0Gl?{1TnmBk&gs4+h4XU#sthVyII Tm`v^hrY#0fS3j3^P6!lvI6;>1s;*b3=DjSL74G){tBRWrb(VIjv*CsZ!g_0T4NyKeDTkJ|MN4m%tDKm z*?V=HJFf*Ry=e>kRNQ?xXqrMQCwAh&j7@c6f9yJ$?WWJ;x~QTTD(0M9-~4*Y(IZY* zqE89MEYUf()}z`xvWa_|Ys!R8ESla1yL7~&CYmM3C>rf>iaZlFQL0Dpb>Cc@|6%1z z*rx4Y+oc(wc%(}^e|f+49=TR~8uU#cu->)^@0jDZ z=drlXu104thYx5>to_3yX6HnemOnoIOGQKik-u7B95eJTF; zBNyXiqDsc$k@^)e9kUGA3C#Se)BQr&Ph^qYj2WB!G@wE1Hs$DJ(U&bi3rZqgia$*| z+RSb^s2NUFPjGo?ZE^dtLklIQ0<)9%hQ zD>#wdw<#luU9V!!ULC6&z1echHM(70W9s(#Jt?e-%vt&P-+j$)(eDq>Ny~{V^(&uF z+Aq6fL!)!+iN_~4y^Gi=@N!3dhfSYO_g}7weZRGX`gfjw^od!nVu{Yd(o;%BUXe{x zR6S6M8N1h5zx#i7(~nwqJ)V+vn|`=%jFEZllKOFShNS7S&Qn#MWl?&4g(;EcIW}d_ r*Ps13Red5T^1&$pJ5jd#?mxy;lhShh7?v&sCRqkgS3j3^P6 private void Start() { DontDestroy(); - AddrResourceMgr.Ins.LoadObject("Assets/Res_Addr/MainUI/UIAtlas.spriteatlas", handle => + AddrResourceMgr.Ins.LoadObject("Assets/Res_Addr/MainUI/UIAtlas.spriteatlasv2", handle => { UIAtlas = handle.Result; }); @@ -28,15 +28,15 @@ public class UIAtlasMgr : MonoBehaviourSingletonTemplate case eMainStatType.STR: case eMainStatType.STR_DEX: case eMainStatType.STR_INT: - return UIAtlas.GetSprite("stat_str"); + return UIAtlas.GetSprite("strong-icon"); case eMainStatType.DEX: case eMainStatType.DEX_STR: case eMainStatType.DEX_INT: - return UIAtlas.GetSprite("stat_dex"); + return UIAtlas.GetSprite("agility-icon"); case eMainStatType.INT: case eMainStatType.INT_STR: case eMainStatType.INT_DEX: - return UIAtlas.GetSprite("stat_int"); + return UIAtlas.GetSprite("intelligent-icon"); case eMainStatType.LUCK: return UIAtlas.GetSprite("stat_luck"); } return null; diff --git a/Assets/Script/UI/Common/BotMenu.cs b/Assets/Script/UI/Common/BotMenu.cs index df31f11bd..2995df37b 100644 --- a/Assets/Script/UI/Common/BotMenu.cs +++ b/Assets/Script/UI/Common/BotMenu.cs @@ -1,11 +1,7 @@ -using System.Collections; -using System.Collections.Generic; -using TMPro; using UnityEngine; public class BotMenu : MonoBehaviourSingletonTemplate { - public TextMeshProUGUI text_onoff; public Transform tf_layout; bool bOn = true; @@ -17,8 +13,7 @@ public class BotMenu : MonoBehaviourSingletonTemplate void Set_OnOff() { - text_onoff.text = bOn ? "Menu\nOn" : "Menu\nOff"; - for (int i = 1; i < tf_layout.childCount; i++) + for (int i = 0; i < tf_layout.childCount; i++) tf_layout.GetChild(i).gameObject.SetActive(bOn); } diff --git a/Assets/Script/UI/Common/GuideQuestUI.cs b/Assets/Script/UI/Common/GuideQuestUI.cs index e5ce8ea76..e8cf6883f 100644 --- a/Assets/Script/UI/Common/GuideQuestUI.cs +++ b/Assets/Script/UI/Common/GuideQuestUI.cs @@ -7,7 +7,7 @@ using UnityEngine.UI; public class GuideQuestUI : MonoBehaviour { public Image[] sprite; // 0 타겟, 1 타겟 서브, 2 보상 - public TextMeshProUGUI[] labels; // 0 보상 개수, 1 할 일, 2 최대 퀘스트 개수, 3 현재 퀘스트 스텝 + public TextMeshProUGUI[] labels; // 0 보상 개수, 1 할 일, 2 최대 퀘스트 개수, 3 퀘스트 카운트 public GameObject[] gos; // 0 보상 받을 수 있음, 1 화면 드래그 public GuideQuestComplete m_GuideQuestComplete; public Animation m_Anim; // GuideQuestLeft GuideQuestRight @@ -141,6 +141,11 @@ public class GuideQuestUI : MonoBehaviour } } + public void OnClick_ImmGo() + { + + } + public void OnClick_Reward() { var sdata = ServerInfo.Ins.m_ServerData; diff --git a/Assets/Script/UI/Common/MainStatCard.cs b/Assets/Script/UI/Common/MainStatCard.cs index 8da26f611..3308b0061 100644 --- a/Assets/Script/UI/Common/MainStatCard.cs +++ b/Assets/Script/UI/Common/MainStatCard.cs @@ -1,7 +1,4 @@ -using System.Collections; -using System.Collections.Generic; using TMPro; -using UnityEngine; using UnityEngine.UI; public class MainStatCard : CardBase @@ -14,7 +11,7 @@ public class MainStatCard : CardBase base.Set(_base); var data = _base as MainStatCardData; - sprite_mainstat.sprite = UIAtlasMgr.Ins.Get_Sprite(DSUtil.Format("stat_{0}", data.mainStatType.ToString().ToLower())); + sprite_mainstat.sprite = UIAtlasMgr.Ins.Get_MainStatSprite(data.mainStatType); var curMap = MyValue.MyChoiceMapData; if (data.showIngameStat) label_stat.text = $"{data.val}+({ServerInfo.Ins.m_ServerData.MapData_Get_StatLv(curMap.n_MapID, curMap.n_Difficult, data.mainStatType)})"; diff --git a/Assets/Script/UI/Stage/MyInfoUI.cs b/Assets/Script/UI/Stage/MyInfoUI.cs index 22ca90bb4..63a99e148 100644 --- a/Assets/Script/UI/Stage/MyInfoUI.cs +++ b/Assets/Script/UI/Stage/MyInfoUI.cs @@ -9,7 +9,7 @@ public class MyInfoUI : MonoBehaviourSingletonuScrollViewArrMgr public Image[] sprites; // 0 얼굴, 1 메인스탯 public TextMeshProUGUI[] labels; // 0 이름, 1 직업 public Slider slider_hp, slider_mp, slider_exp; - public TextMeshProUGUI[] texts; // 0 hp, 1 mp, 2 lv exp(%) + public TextMeshProUGUI[] texts; // 0 hp, 1 mp, 2 lv 3 exp List mainStatCardDatas = new List { @@ -53,7 +53,8 @@ public class MyInfoUI : MonoBehaviourSingletonuScrollViewArrMgr labels[1].text = classData.Get_JobName(); slider_exp.value = sdata.PC.Get_ExpSliderValue(); - texts[2].text = DSUtil.Format("Lv.{0} {1}%", sdata.PC.Lv, DSUtil.GetCommaText_N2(slider_exp.value * 100f)); + texts[2].text = DSUtil.Format("Lv.{0}", sdata.PC.Lv); + texts[3].text = DSUtil.Format("{0}%", DSUtil.GetCommaText_N2(slider_exp.value * 100f)); Set_MainStats(); Set_ScrollView(1, list_buffindex);