From 0141357405faea4945f8fa534ad84c8fe003a2b0 Mon Sep 17 00:00:00 2001 From: Ino Date: Fri, 31 Jan 2025 13:34:27 +0900 Subject: [PATCH] =?UTF-8?q?=EB=9E=AD=ED=82=B9=20=EB=A6=AC=ED=8C=A9?= =?UTF-8?q?=ED=86=A0=EB=A7=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/Ino_nerdnavis.txt | 4 +- Assets/Res_Addr/MainUI/NewGameUI.prefab | 45 ++++++++++++------- Assets/Script/UI/Map/MapChoiceUI_Dungeon.cs | 2 +- Assets/Script/UI/Rank/Rank_Maze.cs | 38 ---------------- Assets/Script/UI/Rank/Rank_Maze_Reward.cs | 7 --- Assets/Script/UI/Rank/RankingBase.cs | 4 -- Assets/Script/UI/Rank/RankingMgr.cs | 13 ++---- Assets/Script/UI/Rank/RankingUI.cs | 37 +++++++++++++++ ...{RankingBase.cs.meta => RankingUI.cs.meta} | 2 +- Assets/Script/UI/Rank/RankingUI_Rank.cs | 32 +++++++++++++ ...nk_Maze.cs.meta => RankingUI_Rank.cs.meta} | 2 +- Assets/Script/UI/Rank/RankingUI_Reward.cs | 13 ++++++ ...eward.cs.meta => RankingUI_Reward.cs.meta} | 2 +- 13 files changed, 120 insertions(+), 81 deletions(-) delete mode 100644 Assets/Script/UI/Rank/Rank_Maze.cs delete mode 100644 Assets/Script/UI/Rank/Rank_Maze_Reward.cs delete mode 100644 Assets/Script/UI/Rank/RankingBase.cs create mode 100644 Assets/Script/UI/Rank/RankingUI.cs rename Assets/Script/UI/Rank/{RankingBase.cs.meta => RankingUI.cs.meta} (83%) create mode 100644 Assets/Script/UI/Rank/RankingUI_Rank.cs rename Assets/Script/UI/Rank/{Rank_Maze.cs.meta => RankingUI_Rank.cs.meta} (83%) create mode 100644 Assets/Script/UI/Rank/RankingUI_Reward.cs rename Assets/Script/UI/Rank/{Rank_Maze_Reward.cs.meta => RankingUI_Reward.cs.meta} (83%) diff --git a/Assets/Ino_nerdnavis.txt b/Assets/Ino_nerdnavis.txt index 81dbbd7a8..a5ee74e8a 100644 --- a/Assets/Ino_nerdnavis.txt +++ b/Assets/Ino_nerdnavis.txt @@ -53,15 +53,17 @@ messageinfo 엄청 느린 버그 수상한 미궁 - 맵 벽과 플레이 사이 더 멀게 만들자 (카메라가 벽 밖에 안 나가게) - - 매월 초기화 후 보상 우편으로 지급 + - 매월 1일 랭킹 초기화 후 보상 우편으로 지급 - 입장권 추가 구매 구현 필요 - 결과 화면 (보상 지급) - 랭킹 15분마다 갱신 악몽의 시련 - 결과 화면 (보상 지급) + - 매일 랭킹 초기화 후 보상 우편으로 지급 - 입장권 추가 구매 구현 필요 - 난이도에 따른 패널티 + - 랭킹 15분마다 갱신 - 시작 시 입장권 차감 - 랭킹 UI 통합(랭킹 및 랭킹 보상이 기본) diff --git a/Assets/Res_Addr/MainUI/NewGameUI.prefab b/Assets/Res_Addr/MainUI/NewGameUI.prefab index fad3914c2..ce0d6ec20 100644 --- a/Assets/Res_Addr/MainUI/NewGameUI.prefab +++ b/Assets/Res_Addr/MainUI/NewGameUI.prefab @@ -5606,6 +5606,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 2905522599481568448} + - component: {fileID: 7752323174804030052} m_Layer: 5 m_Name: Ranking m_TagString: Untagged @@ -5637,6 +5638,22 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &7752323174804030052 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 564235503569457949} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0288db02082f0be458aaea44114c3db2, type: 3} + m_Name: + m_EditorClassIdentifier: + m_ScrollRect: {fileID: 6604571758126327100} + m_Content: {fileID: 0} + go_card: {fileID: 710708825502186299, guid: 3dcc0fd4e474fee4a89712ec369fb040, type: 3} + myRank: {fileID: 8413171323054707053} --- !u!1 &567412856604436246 GameObject: m_ObjectHideFlags: 0 @@ -53337,9 +53354,9 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 42808435850860132} - - component: {fileID: 2235358054737525818} + - component: {fileID: 8875568081737074834} m_Layer: 5 - m_Name: Rank_Maze + m_Name: RankingUI m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -53366,7 +53383,7 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &2235358054737525818 +--- !u!114 &8875568081737074834 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -53375,17 +53392,12 @@ MonoBehaviour: m_GameObject: {fileID: 4791435642623592046} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 708d9be4171d4554d8a7e7bce201b88f, type: 3} + m_Script: {fileID: 11500000, guid: f5bcc68bd7d98b84b83128cf9be7f9e7, type: 3} m_Name: m_EditorClassIdentifier: - m_ScrollRect: {fileID: 6604571758126327100} - m_Content: {fileID: 6884217557492167859} - go_card: {fileID: 710708825502186299, guid: 3dcc0fd4e474fee4a89712ec369fb040, type: 3} m_Tab: {fileID: 2949788278511274615} - myRank: {fileID: 8413171323054707053} - gos: - - {fileID: 564235503569457949} - - {fileID: 6884217557492167859} + m_Rank: {fileID: 7752323174804030052} + m_Reward: {fileID: 242524178656213461} --- !u!1 &4791490540812428574 GameObject: m_ObjectHideFlags: 0 @@ -55397,8 +55409,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: go_Camera: {fileID: 0} - rankings: - - {fileID: 2235358054737525818} + m_RankingUI: {fileID: 8875568081737074834} --- !u!1 &4944573237779459871 GameObject: m_ObjectHideFlags: 0 @@ -58877,7 +58888,7 @@ MonoBehaviour: m_OnClick: m_PersistentCalls: m_Calls: - - m_Target: {fileID: 2235358054737525818} + - m_Target: {fileID: 0} m_TargetAssemblyTypeName: BackKeyAdd, Assembly-CSharp m_MethodName: OnClick_Back m_Mode: 1 @@ -75655,7 +75666,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 5607384215265155754} - - component: {fileID: 5548667689334893316} + - component: {fileID: 242524178656213461} m_Layer: 5 m_Name: RankReward m_TagString: Untagged @@ -75685,7 +75696,7 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &5548667689334893316 +--- !u!114 &242524178656213461 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -75694,7 +75705,7 @@ MonoBehaviour: m_GameObject: {fileID: 6884217557492167859} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 25c5e46f99098bc4e89c2c9a68cf9f1b, type: 3} + m_Script: {fileID: 11500000, guid: 784b520d85cde274abc85ad077eed7ee, type: 3} m_Name: m_EditorClassIdentifier: m_ScrollRect: {fileID: 5705328328383091114} diff --git a/Assets/Script/UI/Map/MapChoiceUI_Dungeon.cs b/Assets/Script/UI/Map/MapChoiceUI_Dungeon.cs index 5baa4e11a..d1afbc898 100644 --- a/Assets/Script/UI/Map/MapChoiceUI_Dungeon.cs +++ b/Assets/Script/UI/Map/MapChoiceUI_Dungeon.cs @@ -131,7 +131,7 @@ public class MapChoiceUI_Dungeon : uScrollViewMgr public void OnClick_MazeRank() { - RankingMgr.Ins.Show_Rank(eRankingType.Maze); + RankingMgr.Ins.Show_Rank(eDungeon.d2_Maze); } void OnClick_NightmareTab() diff --git a/Assets/Script/UI/Rank/Rank_Maze.cs b/Assets/Script/UI/Rank/Rank_Maze.cs deleted file mode 100644 index 775b8c3a4..000000000 --- a/Assets/Script/UI/Rank/Rank_Maze.cs +++ /dev/null @@ -1,38 +0,0 @@ -using PlayFab.ProgressionModels; -using System.Collections.Generic; -using UnityEngine; - -public class Rank_Maze : RankingBase -{ - public TabUIBase m_Tab; - public RankCard_Maze myRank; - public GameObject[] gos; // 0 랭킹, 1 랭킹 보상 - - List list_TabData = new List { new TabUIData{ n_btnName = 325 }, new TabUIData{ n_btnName = 326 } }; - List list_rank100; - - public override void Set() - { - base.Set(); - list_TabData.ForEach(f => f.onClick = OnClick_Tab); - m_Tab.Set(list_TabData); - OnClick_Tab(); - } - - void OnClick_Tab() - { - var index = m_Tab.Get_Index(); - DSUtil.InActivateGameObjects(gos, index); - if (index == 0) - { - if (true) - { // 랭킹 갱신 - CardBase_AllOff(); - ServerInfo.Ins.Get_Rank("Rank_Maze", rank100 => { list_rank100 = rank100; Set_ScrollView(list_rank100); }); - ServerInfo.Ins.Get_MyRank("Rank_Maze", my => { myRank.Set(my); }); - } - // 랭킹 갱신 시간 아니면 아무것도 안해도 됨 - } - // 랭킹 리워드는 굳이 따로 할 필요없음 (오브젝트 켜지면 알아서 함) - } -} \ No newline at end of file diff --git a/Assets/Script/UI/Rank/Rank_Maze_Reward.cs b/Assets/Script/UI/Rank/Rank_Maze_Reward.cs deleted file mode 100644 index e292f43f5..000000000 --- a/Assets/Script/UI/Rank/Rank_Maze_Reward.cs +++ /dev/null @@ -1,7 +0,0 @@ -public class Rank_Maze_Reward : uScrollViewMgr -{ - private void Start() - { - Set_ScrollView(table_rankrewardlist.Ins.Get_DataList()); - } -} \ No newline at end of file diff --git a/Assets/Script/UI/Rank/RankingBase.cs b/Assets/Script/UI/Rank/RankingBase.cs deleted file mode 100644 index 6aceeef8e..000000000 --- a/Assets/Script/UI/Rank/RankingBase.cs +++ /dev/null @@ -1,4 +0,0 @@ -public class RankingBase : uScrollViewMgr -{ - -} \ No newline at end of file diff --git a/Assets/Script/UI/Rank/RankingMgr.cs b/Assets/Script/UI/Rank/RankingMgr.cs index 959780448..fcbc46317 100644 --- a/Assets/Script/UI/Rank/RankingMgr.cs +++ b/Assets/Script/UI/Rank/RankingMgr.cs @@ -1,16 +1,9 @@ -public enum eRankingType { Maze, } - public class RankingMgr : MonoBehaviourSingletonTemplate { - public RankingBase[] rankings; + public RankingUI m_RankingUI; - public void Show_Rank(eRankingType rankingType) + public void Show_Rank(eDungeon dungeon) { - switch (rankingType) - { - case eRankingType.Maze: - rankings[0].Set(); - break; - } + m_RankingUI.Set(dungeon); } } \ No newline at end of file diff --git a/Assets/Script/UI/Rank/RankingUI.cs b/Assets/Script/UI/Rank/RankingUI.cs new file mode 100644 index 000000000..d1be6f737 --- /dev/null +++ b/Assets/Script/UI/Rank/RankingUI.cs @@ -0,0 +1,37 @@ +using System.Collections.Generic; + +public class RankingUI : BackKeyAdd +{ + public TabUIBase m_Tab; + protected List list_TabData = new List + { new TabUIData { n_btnName = 325 }, new TabUIData { n_btnName = 326 } }; + + public RankingUI_Rank m_Rank; + public RankingUI_Reward m_Reward; + + eDungeon m_Dungeon; + + public void Set(eDungeon dungeon) + { + base.Set(); + m_Dungeon = dungeon; + list_TabData.ForEach(f => f.onClick = OnClick_Tab); + m_Tab.Set(list_TabData); + OnClick_Tab(); + } + + void OnClick_Tab() + { + var index = m_Tab.Get_Index(); + if (index == 0) + { + m_Rank.Set(m_Dungeon); + m_Reward.gameObject.SetActive(false); + } + else + { + m_Rank.gameObject.SetActive(false); + m_Reward.Set(m_Dungeon); + } + } +} \ No newline at end of file diff --git a/Assets/Script/UI/Rank/RankingBase.cs.meta b/Assets/Script/UI/Rank/RankingUI.cs.meta similarity index 83% rename from Assets/Script/UI/Rank/RankingBase.cs.meta rename to Assets/Script/UI/Rank/RankingUI.cs.meta index 4c4774fbf..d7f2955a0 100644 --- a/Assets/Script/UI/Rank/RankingBase.cs.meta +++ b/Assets/Script/UI/Rank/RankingUI.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 7887175c9c19eed4aa5718b480658a6f +guid: f5bcc68bd7d98b84b83128cf9be7f9e7 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Assets/Script/UI/Rank/RankingUI_Rank.cs b/Assets/Script/UI/Rank/RankingUI_Rank.cs new file mode 100644 index 000000000..e21d8e564 --- /dev/null +++ b/Assets/Script/UI/Rank/RankingUI_Rank.cs @@ -0,0 +1,32 @@ +using PlayFab.ProgressionModels; +using System.Collections.Generic; + +public class RankingUI_Rank : uScrollViewMgr +{ + public RankCard_Maze myRank; + + Dictionary dic_RefreshTime = new Dictionary(); + Dictionary dic_Leaderboard = new Dictionary + { {eDungeon.d2_Maze, "Rank_Maze" }, {eDungeon.d3_Nightmare, "Rank_Damage" }, }; + + Dictionary> dic_ranks = new Dictionary>(); + + + public void Set(eDungeon dungeon) + { + gameObject.SetActive(true); + + ServerInfo.Ins.Get_Rank(dic_Leaderboard[dungeon], rank100 => + { + if (!dic_RefreshTime.ContainsKey(dungeon)) dic_RefreshTime.Add(dungeon, 0); + dic_RefreshTime[dungeon] = 900; + + if (!dic_ranks.ContainsKey(dungeon)) dic_ranks.Add(dungeon, null); + dic_ranks[dungeon] = rank100; + + Set_ScrollView(dic_ranks[dungeon]); + }); + + ServerInfo.Ins.Get_MyRank(dic_Leaderboard[dungeon], my => { myRank.Set(my); }); + } +} \ No newline at end of file diff --git a/Assets/Script/UI/Rank/Rank_Maze.cs.meta b/Assets/Script/UI/Rank/RankingUI_Rank.cs.meta similarity index 83% rename from Assets/Script/UI/Rank/Rank_Maze.cs.meta rename to Assets/Script/UI/Rank/RankingUI_Rank.cs.meta index 694e21f04..d004eb4c0 100644 --- a/Assets/Script/UI/Rank/Rank_Maze.cs.meta +++ b/Assets/Script/UI/Rank/RankingUI_Rank.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 708d9be4171d4554d8a7e7bce201b88f +guid: 0288db02082f0be458aaea44114c3db2 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Assets/Script/UI/Rank/RankingUI_Reward.cs b/Assets/Script/UI/Rank/RankingUI_Reward.cs new file mode 100644 index 000000000..016ff020c --- /dev/null +++ b/Assets/Script/UI/Rank/RankingUI_Reward.cs @@ -0,0 +1,13 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class RankingUI_Reward : uScrollViewMgr +{ + public void Set(eDungeon dungeon) + { + gameObject.SetActive(true); + + + } +} \ No newline at end of file diff --git a/Assets/Script/UI/Rank/Rank_Maze_Reward.cs.meta b/Assets/Script/UI/Rank/RankingUI_Reward.cs.meta similarity index 83% rename from Assets/Script/UI/Rank/Rank_Maze_Reward.cs.meta rename to Assets/Script/UI/Rank/RankingUI_Reward.cs.meta index 7295b7cdb..4016bd1c8 100644 --- a/Assets/Script/UI/Rank/Rank_Maze_Reward.cs.meta +++ b/Assets/Script/UI/Rank/RankingUI_Reward.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 25c5e46f99098bc4e89c2c9a68cf9f1b +guid: 784b520d85cde274abc85ad077eed7ee MonoImporter: externalObjects: {} serializedVersion: 2