From 966f37999ce1d2eda2792f69131644fd596d90ac Mon Sep 17 00:00:00 2001 From: Ino Date: Fri, 8 Aug 2025 04:37:32 +0900 Subject: [PATCH] =?UTF-8?q?=EA=B0=80=ED=80=98=20=EC=9E=91=EC=97=85=20?= =?UTF-8?q?=EC=A4=91...=20=ED=81=B4=EB=9D=BC->=EC=84=9C=EB=B2=84=20?= =?UTF-8?q?=EA=B3=B5=ED=86=B5=20=EB=8D=B0=EC=9D=B4=ED=84=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Editor/Resources/.CloudScript.js | 7 + Assets/Script/Server/ServerClass.cs | 19 + Assets/Script/Server/ServerInfo.cs | 524 ++++++++---------- Assets/Script/Table/table_chapterquest.cs | 4 +- Assets/Script/UI/Common/GuideQuestUI.cs | 29 +- Assets/Script/UI/Shop_old/ShopEventCheck.cs | 2 +- Assets/Script/Util/MyEnum.cs | 4 +- Assets/Script/Util/MyValue.cs | 2 +- 8 files changed, 279 insertions(+), 312 deletions(-) diff --git a/Assets/PlayFabEditorExtensions/Editor/Resources/.CloudScript.js b/Assets/PlayFabEditorExtensions/Editor/Resources/.CloudScript.js index 6e87e6e25..19d36f67c 100644 --- a/Assets/PlayFabEditorExtensions/Editor/Resources/.CloudScript.js +++ b/Assets/PlayFabEditorExtensions/Editor/Resources/.CloudScript.js @@ -198,6 +198,7 @@ function Create_NewUserData() { data.Gacha = {}; data.Shop = {}; data.LimitBreakOption = { Preset: [0,0,0], Option: {} } + Set_GuideQuest(data); return data; } @@ -367,6 +368,12 @@ function Init_Farm() { Shop: {} }; } +function Set_GuideQuest(urod, add) +{ + if (!urod.GuideQuest) urod.GuideQuest = { Step: 0, Count: 0 }; + if (add) ++urod.GuideQuest.Step; + urod.GuideQuest.Count = 0; +} handlers.Get_OtherUserInfo = function (args) { diff --git a/Assets/Script/Server/ServerClass.cs b/Assets/Script/Server/ServerClass.cs index 7510a7ec5..20972d0db 100644 --- a/Assets/Script/Server/ServerClass.cs +++ b/Assets/Script/Server/ServerClass.cs @@ -40,6 +40,7 @@ public class SC_MyResult { public int result; } public partial class ServerData { public DateTime LastTime; + public SD_GuideQuest GuideQuest; public List Common; /// /// { 맵 ID, { 난이도, 데이터 } } @@ -256,6 +257,7 @@ public partial class ServerData public class ServerData_Read { public DateTime LastTime; + public SD_GuideQuest GuideQuest; public Dictionary> MapData = new Dictionary>(); public SD_Buff_Read Buff; public SD_Equip_Read Equip; @@ -293,6 +295,7 @@ public class ServerData_Read ServerData temp = new ServerData(); temp.IsEnemy = _isEnemy; temp.LastTime = LastTime; + temp.GuideQuest = GuideQuest; temp.MapData = new Dictionary>(); foreach (var item in MapData) { @@ -2301,6 +2304,22 @@ public class ServerData_ChapterQuest_Read #endregion #region New 데이터 클래스 +public class SD_GuideQuest +{ + protected ObscuredInt _Step; + public int Step + { + get { return _Step; } + set { _Step = value; _Step.RandomizeCryptoKey(); } + } + + protected ObscuredInt _Count; + public int Count + { + get { return _Count; } + set { _Count = value; _Count.RandomizeCryptoKey(); } + } +} public class SD_Equip { public Dictionary Equip; diff --git a/Assets/Script/Server/ServerInfo.cs b/Assets/Script/Server/ServerInfo.cs index 9dc2a913e..9c026eacd 100644 --- a/Assets/Script/Server/ServerInfo.cs +++ b/Assets/Script/Server/ServerInfo.cs @@ -11,6 +11,8 @@ using System.Collections.Generic; using System.Reflection; using UnityEngine; using UnityEngine.Networking; +using static InvBaseItem; +using static UnityEngine.Rendering.VolumeComponent; using Random = UnityEngine.Random; public class ServerInfo : MyCoroutine @@ -726,6 +728,23 @@ public class ServerInfo : MyCoroutine public bool IsNewUser() { return string.IsNullOrEmpty(UserName); } #region 신규 서버 + private Dictionary MakeFunctionParams(Dictionary extraParams = null) + { + var param = new Dictionary + { + { "Token", m_LoginInfo.EntityToken.EntityToken }, + //{ "gCount", m_ServerData.GuideQuest.Count } + }; + + if (extraParams != null) + { + foreach (var kvp in extraParams) + param[kvp.Key] = kvp.Value; + } + + return param; + } + public void Save_CheatItem(int itemid, double amount, Action _act = null) { NetWait.Ins.Set(true); @@ -733,12 +752,11 @@ public class ServerInfo : MyCoroutine { FunctionName = MethodBase.GetCurrentMethod().Name, GeneratePlayStreamEvent = true, - FunctionParameter = new + FunctionParameter = MakeFunctionParams(new Dictionary { - Token = m_LoginInfo.EntityToken.EntityToken, - ID = itemid, - Amount = amount - } + { "ID", itemid }, + { "Amount", amount } + }) }, result => { @@ -762,10 +780,7 @@ public class ServerInfo : MyCoroutine { FunctionName = MethodBase.GetCurrentMethod().Name, GeneratePlayStreamEvent = true, - FunctionParameter = new - { - Token = m_LoginInfo.EntityToken.EntityToken, - } + FunctionParameter = MakeFunctionParams() }, result => { @@ -811,22 +826,21 @@ public class ServerInfo : MyCoroutine { FunctionName = MethodBase.GetCurrentMethod().Name, GeneratePlayStreamEvent = true, - FunctionParameter = new + FunctionParameter = MakeFunctionParams(new Dictionary { - Token = m_LoginInfo.EntityToken.EntityToken, - Diff = MyValue.MyChoiceMapData.n_Difficult, - MapID = MyValue.MyChoiceMapData.n_MapID, - Exp = DropItemInfo.Ins.m_StageDropData.GetExp.GetDecrypted(), - UseGold = DropItemInfo.Ins.m_StageDropData.UseGold.GetDecrypted(), - AddStatSTR = DropItemInfo.Ins.m_StageDropData.Get_MainStat(eMainStatType.STR), - AddStatDEX = DropItemInfo.Ins.m_StageDropData.Get_MainStat(eMainStatType.DEX), - AddStatINT = DropItemInfo.Ins.m_StageDropData.Get_MainStat(eMainStatType.INT), - Item = items, - Mob = MobKill, - Elite = EliteKill, - Boss = BossKill, - Auto = m_ServerData.Get_Common(eCommon.Auto), - } + { "Diff", MyValue.MyChoiceMapData.n_Difficult }, + { "MapID", MyValue.MyChoiceMapData.n_MapID }, + { "Exp", DropItemInfo.Ins.m_StageDropData.GetExp.GetDecrypted() }, + { "UseGold", DropItemInfo.Ins.m_StageDropData.UseGold.GetDecrypted() }, + { "AddStatSTR", DropItemInfo.Ins.m_StageDropData.Get_MainStat(eMainStatType.STR) }, + { "AddStatDEX", DropItemInfo.Ins.m_StageDropData.Get_MainStat(eMainStatType.DEX) }, + { "AddStatINT", DropItemInfo.Ins.m_StageDropData.Get_MainStat(eMainStatType.INT) }, + { "Item", items }, + { "Mob", MobKill }, + { "Elite", EliteKill }, + { "Boss", BossKill }, + { "Auto", m_ServerData.Get_Common(eCommon.Auto) } + }) }, result => { @@ -850,41 +864,6 @@ public class ServerInfo : MyCoroutine Set_Coroutine(() => { Save_StageResult(_act); }, 2f); }); } - public void Save_MimicResult(bool? win, int lv, Action _act) - { - NetWait.Ins.Set(true); - PlayFabClientAPI.ExecuteCloudScript(new ExecuteCloudScriptRequest - { - FunctionName = MethodBase.GetCurrentMethod().Name, - GeneratePlayStreamEvent = true, - FunctionParameter = new - { - Token = m_LoginInfo.EntityToken.EntityToken, - Win = win, - Lv = lv, - } - }, - result => - { - if (result.Error == null) - { - NetWait.Ins.Set(false); - var str_result = result.FunctionResult.ToString(); - var error = MyErrorCheck(str_result); - switch (error) - { - case 1: ToastUI.Ins.Set(999900045); break; - } - _act?.Invoke(error); - } - else - Set_Coroutine(() => { Save_MimicResult(win, lv, _act); }, 2f); - }, - fail => - { - Set_Coroutine(() => { Save_MimicResult(win, lv, _act); }, 2f); - }); - } public void Save_DungeonStart(int ticketid, Action _act) { NetWait.Ins.Set(true); @@ -892,11 +871,10 @@ public class ServerInfo : MyCoroutine { FunctionName = MethodBase.GetCurrentMethod().Name, GeneratePlayStreamEvent = true, - FunctionParameter = new + FunctionParameter = MakeFunctionParams(new Dictionary { - Token = m_LoginInfo.EntityToken.EntityToken, - TicketID = ticketid, - } + { "TicketID", ticketid }, + }) }, result => { @@ -919,6 +897,40 @@ public class ServerInfo : MyCoroutine Set_Coroutine(() => { Save_DungeonStart(ticketid, _act); }, 2f); }); } + public void Save_MimicResult(bool? win, int lv, Action _act) + { + NetWait.Ins.Set(true); + PlayFabClientAPI.ExecuteCloudScript(new ExecuteCloudScriptRequest + { + FunctionName = MethodBase.GetCurrentMethod().Name, + GeneratePlayStreamEvent = true, + FunctionParameter = MakeFunctionParams(new Dictionary + { + { "Win", win }, + { "Lv", lv }, + }) + }, + result => + { + if (result.Error == null) + { + NetWait.Ins.Set(false); + var str_result = result.FunctionResult.ToString(); + var error = MyErrorCheck(str_result); + switch (error) + { + case 1: ToastUI.Ins.Set(999900045); break; + } + _act?.Invoke(error); + } + else + Set_Coroutine(() => { Save_MimicResult(win, lv, _act); }, 2f); + }, + fail => + { + Set_Coroutine(() => { Save_MimicResult(win, lv, _act); }, 2f); + }); + } public void Save_MazeResult(int nextfloor, Action _act) { NetWait.Ins.Set(true); @@ -926,11 +938,10 @@ public class ServerInfo : MyCoroutine { FunctionName = MethodBase.GetCurrentMethod().Name, GeneratePlayStreamEvent = true, - FunctionParameter = new + FunctionParameter = MakeFunctionParams(new Dictionary { - Token = m_LoginInfo.EntityToken.EntityToken, - NextFloor = nextfloor, - } + { "NextFloor", nextfloor }, + }) }, result => { @@ -960,11 +971,10 @@ public class ServerInfo : MyCoroutine { FunctionName = MethodBase.GetCurrentMethod().Name, GeneratePlayStreamEvent = true, - FunctionParameter = new + FunctionParameter = MakeFunctionParams(new Dictionary { - Token = m_LoginInfo.EntityToken.EntityToken, - Dmg = dmg, - } + { "Dmg", dmg }, + }) }, result => { @@ -990,11 +1000,10 @@ public class ServerInfo : MyCoroutine { FunctionName = MethodBase.GetCurrentMethod().Name, GeneratePlayStreamEvent = true, - FunctionParameter = new + FunctionParameter = MakeFunctionParams(new Dictionary { - Token = m_LoginInfo.EntityToken.EntityToken, - Point = point, - } + { "Point", point }, + }) }, result => { @@ -1022,15 +1031,14 @@ public class ServerInfo : MyCoroutine { FunctionName = MethodBase.GetCurrentMethod().Name, GeneratePlayStreamEvent = true, - FunctionParameter = new + FunctionParameter = MakeFunctionParams(new Dictionary { - Token = m_LoginInfo.EntityToken.EntityToken, - CostumeID = costumeid, - WorkerID = workerid, - JobID = jobid, - AwakenData = awakenData, - LimitSlotData = limitslotData - } + { "CostumeID", costumeid }, + { "WorkerID", workerid }, + { "JobID", jobid }, + { "AwakenData", awakenData }, + { "LimitSlotData", limitslotData }, + }) }, result => { @@ -1064,11 +1072,10 @@ public class ServerInfo : MyCoroutine { FunctionName = MethodBase.GetCurrentMethod().Name, GeneratePlayStreamEvent = true, - FunctionParameter = new + FunctionParameter = MakeFunctionParams(new Dictionary { - Token = m_LoginInfo.EntityToken.EntityToken, - UsePoint = usepoint, - } + { "UsePoint", usepoint }, + }) }, result => { @@ -1098,10 +1105,7 @@ public class ServerInfo : MyCoroutine { FunctionName = MethodBase.GetCurrentMethod().Name, GeneratePlayStreamEvent = true, - FunctionParameter = new - { - Token = m_LoginInfo.EntityToken.EntityToken, - } + FunctionParameter = MakeFunctionParams() }, result => { @@ -1137,12 +1141,11 @@ public class ServerInfo : MyCoroutine { FunctionName = MethodBase.GetCurrentMethod().Name, GeneratePlayStreamEvent = true, - FunctionParameter = new + FunctionParameter = MakeFunctionParams(new Dictionary { - Token = m_LoginInfo.EntityToken.EntityToken, - AbilityID = abilityID, - nBattleType = nbattletype, - } + { "AbilityID", abilityID }, + { "nBattleType", nbattletype }, + }) }, result => { @@ -1175,11 +1178,10 @@ public class ServerInfo : MyCoroutine { FunctionName = MethodBase.GetCurrentMethod().Name, GeneratePlayStreamEvent = true, - FunctionParameter = new + FunctionParameter = MakeFunctionParams(new Dictionary { - Token = m_LoginInfo.EntityToken.EntityToken, - BattleType = battleType, - } + { "BattleType", battleType }, + }) }, result => { @@ -1215,11 +1217,10 @@ public class ServerInfo : MyCoroutine { FunctionName = MethodBase.GetCurrentMethod().Name, GeneratePlayStreamEvent = true, - FunctionParameter = new + FunctionParameter = MakeFunctionParams(new Dictionary { - Token = m_LoginInfo.EntityToken.EntityToken, - JobID = jobid, - } + { "JobID", jobid }, + }) }, result => { @@ -1254,10 +1255,7 @@ public class ServerInfo : MyCoroutine { FunctionName = MethodBase.GetCurrentMethod().Name, GeneratePlayStreamEvent = true, - FunctionParameter = new - { - Token = m_LoginInfo.EntityToken.EntityToken, - } + FunctionParameter = MakeFunctionParams() }, result => { @@ -1292,11 +1290,10 @@ public class ServerInfo : MyCoroutine { FunctionName = MethodBase.GetCurrentMethod().Name, GeneratePlayStreamEvent = true, - FunctionParameter = new + FunctionParameter = MakeFunctionParams(new Dictionary { - Token = m_LoginInfo.EntityToken.EntityToken, - LimitSlotData = lsd - } + { "LimitSlotData", lsd }, + }) }, result => { @@ -1328,11 +1325,10 @@ public class ServerInfo : MyCoroutine { FunctionName = MethodBase.GetCurrentMethod().Name, GeneratePlayStreamEvent = true, - FunctionParameter = new + FunctionParameter = MakeFunctionParams(new Dictionary { - Token = m_LoginInfo.EntityToken.EntityToken, - Preset = preset - } + { "Preset", preset }, + }) }, result => { @@ -1370,12 +1366,11 @@ public class ServerInfo : MyCoroutine { FunctionName = MethodBase.GetCurrentMethod().Name, GeneratePlayStreamEvent = true, - FunctionParameter = new + FunctionParameter = MakeFunctionParams(new Dictionary { - Token = m_LoginInfo.EntityToken.EntityToken, - Preset = preset, - Slot = slot, - } + { "Preset", preset }, + { "Slot", slot }, + }) }, result => { @@ -1407,11 +1402,10 @@ public class ServerInfo : MyCoroutine { FunctionName = MethodBase.GetCurrentMethod().Name, GeneratePlayStreamEvent = true, - FunctionParameter = new + FunctionParameter = MakeFunctionParams(new Dictionary { - Token = m_LoginInfo.EntityToken.EntityToken, - ItemID = itemid, - } + { "ItemID", itemid }, + }) }, result => { @@ -1444,11 +1438,10 @@ public class ServerInfo : MyCoroutine { FunctionName = MethodBase.GetCurrentMethod().Name, GeneratePlayStreamEvent = true, - FunctionParameter = new + FunctionParameter = MakeFunctionParams(new Dictionary { - Token = m_LoginInfo.EntityToken.EntityToken, - ItemID = itemid, - } + { "ItemID", itemid }, + }) }, result => { @@ -1480,11 +1473,10 @@ public class ServerInfo : MyCoroutine { FunctionName = MethodBase.GetCurrentMethod().Name, GeneratePlayStreamEvent = true, - FunctionParameter = new + FunctionParameter = MakeFunctionParams(new Dictionary { - Token = m_LoginInfo.EntityToken.EntityToken, - ItemID = itemid, - } + { "ItemID", itemid }, + }) }, result => { @@ -1518,12 +1510,11 @@ public class ServerInfo : MyCoroutine { FunctionName = MethodBase.GetCurrentMethod().Name, GeneratePlayStreamEvent = true, - FunctionParameter = new + FunctionParameter = MakeFunctionParams(new Dictionary { - Token = m_LoginInfo.EntityToken.EntityToken, - ItemID = itemid, - Count = count, - } + { "ItemID", itemid }, + { "Count", count }, + }) }, result => { @@ -1556,11 +1547,10 @@ public class ServerInfo : MyCoroutine { FunctionName = MethodBase.GetCurrentMethod().Name, GeneratePlayStreamEvent = true, - FunctionParameter = new + FunctionParameter = MakeFunctionParams(new Dictionary { - Token = m_LoginInfo.EntityToken.EntityToken, - ItemID = itemid, - } + { "ItemID", itemid }, + }) }, result => { @@ -1594,11 +1584,10 @@ public class ServerInfo : MyCoroutine { FunctionName = MethodBase.GetCurrentMethod().Name, GeneratePlayStreamEvent = true, - FunctionParameter = new + FunctionParameter = MakeFunctionParams(new Dictionary { - Token = m_LoginInfo.EntityToken.EntityToken, - ItemID = itemid, - } + { "ItemID", itemid }, + }) }, result => { @@ -1632,12 +1621,11 @@ public class ServerInfo : MyCoroutine { FunctionName = MethodBase.GetCurrentMethod().Name, GeneratePlayStreamEvent = true, - FunctionParameter = new + FunctionParameter = MakeFunctionParams(new Dictionary { - Token = m_LoginInfo.EntityToken.EntityToken, - EquipMenuData = data, - NeedOptionid = needoptionid - } + { "EquipMenuData", data }, + { "NeedOptionid", needoptionid }, + }) }, result => { @@ -1673,13 +1661,12 @@ public class ServerInfo : MyCoroutine { FunctionName = MethodBase.GetCurrentMethod().Name, GeneratePlayStreamEvent = true, - FunctionParameter = new + FunctionParameter = MakeFunctionParams(new Dictionary { - Token = m_LoginInfo.EntityToken.EntityToken, - ItemID = itemid, - EnchantID = eid, - Slot = slot - } + { "ItemID", itemid }, + { "EnchantID", eid }, + { "Slot", slot }, + }) }, result => { @@ -1714,11 +1701,10 @@ public class ServerInfo : MyCoroutine { FunctionName = MethodBase.GetCurrentMethod().Name, GeneratePlayStreamEvent = true, - FunctionParameter = new + FunctionParameter = MakeFunctionParams(new Dictionary { - Token = m_LoginInfo.EntityToken.EntityToken, - EquipMenuData = data, - } + { "EquipMenuData", data }, + }) }, result => { @@ -1745,11 +1731,10 @@ public class ServerInfo : MyCoroutine { FunctionName = MethodBase.GetCurrentMethod().Name, GeneratePlayStreamEvent = true, - FunctionParameter = new + FunctionParameter = MakeFunctionParams(new Dictionary { - Token = m_LoginInfo.EntityToken.EntityToken, - EnchantID = eid, - } + { "EnchantID", eid }, + }) }, result => { @@ -1782,14 +1767,13 @@ public class ServerInfo : MyCoroutine { FunctionName = MethodBase.GetCurrentMethod().Name, GeneratePlayStreamEvent = true, - FunctionParameter = new + FunctionParameter = MakeFunctionParams(new Dictionary { - Token = m_LoginInfo.EntityToken.EntityToken, - Preset = preset, - Skills1 = skills[1], - Skills2 = skills[2], - Skills3 = skills[3], - } + { "Preset", preset }, + { "Skills1", skills[1] }, + { "Skills2", skills[2] }, + { "Skills3", skills[3] }, + }) }, result => { @@ -1819,11 +1803,10 @@ public class ServerInfo : MyCoroutine { FunctionName = MethodBase.GetCurrentMethod().Name, GeneratePlayStreamEvent = true, - FunctionParameter = new + FunctionParameter = MakeFunctionParams(new Dictionary { - Token = m_LoginInfo.EntityToken.EntityToken, - SkillID = skillid, - } + { "SkillID", skillid }, + }) }, result => { @@ -1895,12 +1878,11 @@ public class ServerInfo : MyCoroutine { FunctionName = MethodBase.GetCurrentMethod().Name, GeneratePlayStreamEvent = true, - FunctionParameter = new + FunctionParameter = MakeFunctionParams(new Dictionary { - Token = m_LoginInfo.EntityToken.EntityToken, - PetID = petid, - MenuBackData = data, - } + { "PetID", petid }, + { "MenuBackData", data }, + }) }, result => { @@ -1926,12 +1908,11 @@ public class ServerInfo : MyCoroutine { FunctionName = MethodBase.GetCurrentMethod().Name, GeneratePlayStreamEvent = true, - FunctionParameter = new + FunctionParameter = MakeFunctionParams(new Dictionary { - Token = m_LoginInfo.EntityToken.EntityToken, - AD = isad, - Amount = amount, - } + { "AD", isad }, + { "Amount", amount }, + }) }, result => { @@ -1956,6 +1937,7 @@ public class ServerInfo : MyCoroutine Set_Coroutine(() => { Save_Pet_Gacha(isad, amount, _act); }, 2f); }); } + [Obsolete("Use Save_Pet_MenuBack Instead")] public void Save_Pet_LvUp(int petid, Action _act) { NetWait.Ins.Set(true); @@ -1963,11 +1945,10 @@ public class ServerInfo : MyCoroutine { FunctionName = MethodBase.GetCurrentMethod().Name, GeneratePlayStreamEvent = true, - FunctionParameter = new + FunctionParameter = MakeFunctionParams(new Dictionary { - Token = m_LoginInfo.EntityToken.EntityToken, - PetID = petid, - } + { "PetID", petid }, + }) }, result => { @@ -1993,6 +1974,7 @@ public class ServerInfo : MyCoroutine Set_Coroutine(() => { Save_Pet_LvUp(petid, _act); }, 2f); }); } + [Obsolete("Use Save_Pet_MenuBack Instead")] public void Save_Pet_Equip(int petid, Action _act) { NetWait.Ins.Set(true); @@ -2000,11 +1982,10 @@ public class ServerInfo : MyCoroutine { FunctionName = MethodBase.GetCurrentMethod().Name, GeneratePlayStreamEvent = true, - FunctionParameter = new + FunctionParameter = MakeFunctionParams(new Dictionary { - Token = m_LoginInfo.EntityToken.EntityToken, - PetID = petid, - } + { "PetID", petid }, + }) }, result => { @@ -2036,12 +2017,11 @@ public class ServerInfo : MyCoroutine { FunctionName = MethodBase.GetCurrentMethod().Name, GeneratePlayStreamEvent = true, - FunctionParameter = new + FunctionParameter = MakeFunctionParams(new Dictionary { - Token = m_LoginInfo.EntityToken.EntityToken, - EssenceID = essenceID, - Amount = amount, - } + { "EssenceID", essenceID }, + { "Amount", amount }, + }) }, result => { @@ -2072,10 +2052,7 @@ public class ServerInfo : MyCoroutine { FunctionName = MethodBase.GetCurrentMethod().Name, GeneratePlayStreamEvent = true, - FunctionParameter = new - { - Token = m_LoginInfo.EntityToken.EntityToken, - } + FunctionParameter = MakeFunctionParams() }, result => { @@ -2107,11 +2084,10 @@ public class ServerInfo : MyCoroutine { FunctionName = MethodBase.GetCurrentMethod().Name, GeneratePlayStreamEvent = true, - FunctionParameter = new + FunctionParameter = MakeFunctionParams(new Dictionary { - Token = m_LoginInfo.EntityToken.EntityToken, - RelicID = relicid, - } + { "RelicID", relicid }, + }) }, result => { @@ -2145,11 +2121,10 @@ public class ServerInfo : MyCoroutine { FunctionName = MethodBase.GetCurrentMethod().Name, GeneratePlayStreamEvent = true, - FunctionParameter = new + FunctionParameter = MakeFunctionParams(new Dictionary { - Token = m_LoginInfo.EntityToken.EntityToken, - RelicID = relicid, - } + { "RelicID", relicid }, + }) }, result => { @@ -2185,12 +2160,11 @@ public class ServerInfo : MyCoroutine { FunctionName = MethodBase.GetCurrentMethod().Name, GeneratePlayStreamEvent = true, - FunctionParameter = new + FunctionParameter = MakeFunctionParams(new Dictionary { - Token = m_LoginInfo.EntityToken.EntityToken, - Condition = condition, - Category = eMenuCategory, - } + { "Condition", condition }, + { "Category", eMenuCategory }, + }) }, result => { @@ -2222,12 +2196,11 @@ public class ServerInfo : MyCoroutine { FunctionName = MethodBase.GetCurrentMethod().Name, GeneratePlayStreamEvent = true, - FunctionParameter = new + FunctionParameter = MakeFunctionParams(new Dictionary { - Token = m_LoginInfo.EntityToken.EntityToken, - GachaID = id, - Count = count, - } + { "GachaID", id }, + { "Count", count }, + }) }, result => { @@ -2258,12 +2231,11 @@ public class ServerInfo : MyCoroutine { FunctionName = MethodBase.GetCurrentMethod().Name, GeneratePlayStreamEvent = true, - FunctionParameter = new + FunctionParameter = MakeFunctionParams(new Dictionary { - Token = m_LoginInfo.EntityToken.EntityToken, - GachaID = id, - SelectItemID = itemid, - } + { "GachaID", id }, + { "SelectItemID", itemid }, + }) }, result => { @@ -2296,11 +2268,10 @@ public class ServerInfo : MyCoroutine { FunctionName = MethodBase.GetCurrentMethod().Name, GeneratePlayStreamEvent = true, - FunctionParameter = new + FunctionParameter = MakeFunctionParams(new Dictionary { - Token = m_LoginInfo.EntityToken.EntityToken, - CostumeID = id, - } + { "CostumeID", id }, + }) }, result => { @@ -2333,11 +2304,10 @@ public class ServerInfo : MyCoroutine { FunctionName = MethodBase.GetCurrentMethod().Name, GeneratePlayStreamEvent = true, - FunctionParameter = new + FunctionParameter = MakeFunctionParams(new Dictionary { - Token = m_LoginInfo.EntityToken.EntityToken, - WorkerID = id, - } + { "WorkerID", id }, + }) }, result => { @@ -2370,12 +2340,11 @@ public class ServerInfo : MyCoroutine { FunctionName = MethodBase.GetCurrentMethod().Name, GeneratePlayStreamEvent = true, - FunctionParameter = new + FunctionParameter = MakeFunctionParams(new Dictionary { - Token = m_LoginInfo.EntityToken.EntityToken, - Group = group, - ID = id, - } + { "Group", group }, + { "ID", id }, + }) }, result => { @@ -2406,11 +2375,10 @@ public class ServerInfo : MyCoroutine { FunctionName = MethodBase.GetCurrentMethod().Name, GeneratePlayStreamEvent = true, - FunctionParameter = new + FunctionParameter = MakeFunctionParams(new Dictionary { - Token = m_LoginInfo.EntityToken.EntityToken, - Group = group, - } + { "Group", group }, + }) }, result => { @@ -2442,11 +2410,10 @@ public class ServerInfo : MyCoroutine { FunctionName = MethodBase.GetCurrentMethod().Name, GeneratePlayStreamEvent = true, - FunctionParameter = new + FunctionParameter = MakeFunctionParams(new Dictionary { - Token = m_LoginInfo.EntityToken.EntityToken, - Index = index, - } + { "Index", index }, + }) }, result => { @@ -2478,12 +2445,11 @@ public class ServerInfo : MyCoroutine { FunctionName = MethodBase.GetCurrentMethod().Name, GeneratePlayStreamEvent = true, - FunctionParameter = new + FunctionParameter = MakeFunctionParams(new Dictionary { - Token = m_LoginInfo.EntityToken.EntityToken, - Slot = slot, - EnchantID = enchantid, - } + { "Slot", slot }, + { "EnchantID", enchantid }, + }) }, result => { @@ -2516,11 +2482,10 @@ public class ServerInfo : MyCoroutine { FunctionName = MethodBase.GetCurrentMethod().Name, GeneratePlayStreamEvent = true, - FunctionParameter = new + FunctionParameter = MakeFunctionParams(new Dictionary { - Token = m_LoginInfo.EntityToken.EntityToken, - Slot = slot, - } + { "Slot", slot }, + }) }, result => { @@ -2552,11 +2517,10 @@ public class ServerInfo : MyCoroutine { FunctionName = MethodBase.GetCurrentMethod().Name, GeneratePlayStreamEvent = true, - FunctionParameter = new + FunctionParameter = MakeFunctionParams(new Dictionary { - Token = m_LoginInfo.EntityToken.EntityToken, - Slot = slot, - } + { "Slot", slot }, + }) }, result => { @@ -2589,12 +2553,11 @@ public class ServerInfo : MyCoroutine { FunctionName = MethodBase.GetCurrentMethod().Name, GeneratePlayStreamEvent = true, - FunctionParameter = new + FunctionParameter = MakeFunctionParams(new Dictionary { - Token = m_LoginInfo.EntityToken.EntityToken, - FruitID = id, - Amount = amount - } + { "FruitID", id }, + { "Amount", amount }, + }) }, result => { @@ -2625,11 +2588,10 @@ public class ServerInfo : MyCoroutine { FunctionName = MethodBase.GetCurrentMethod().Name, GeneratePlayStreamEvent = true, - FunctionParameter = new + FunctionParameter = MakeFunctionParams(new Dictionary { - Token = m_LoginInfo.EntityToken.EntityToken, - FarmerID = id, - } + { "FarmerID", id }, + }) }, result => { @@ -2660,11 +2622,10 @@ public class ServerInfo : MyCoroutine { FunctionName = MethodBase.GetCurrentMethod().Name, GeneratePlayStreamEvent = true, - FunctionParameter = new + FunctionParameter = MakeFunctionParams(new Dictionary { - Token = m_LoginInfo.EntityToken.EntityToken, - FarmShopID = id, - } + { "FarmShopID", id }, + }) }, result => { @@ -2715,10 +2676,7 @@ public class ServerInfo : MyCoroutine { FunctionName = MethodBase.GetCurrentMethod().Name, GeneratePlayStreamEvent = true, - FunctionParameter = new - { - Token = m_LoginInfo.EntityToken.EntityToken, - } + FunctionParameter = MakeFunctionParams() }, result => { @@ -2745,11 +2703,10 @@ public class ServerInfo : MyCoroutine { FunctionName = MethodBase.GetCurrentMethod().Name, GeneratePlayStreamEvent = true, - FunctionParameter = new + FunctionParameter = MakeFunctionParams(new Dictionary { - Token = m_LoginInfo.EntityToken.EntityToken, - RemainTime = _remaintime, - } + { "RemainTime", _remaintime }, + }) }, result => { @@ -2776,10 +2733,7 @@ public class ServerInfo : MyCoroutine { FunctionName = MethodBase.GetCurrentMethod().Name, GeneratePlayStreamEvent = true, - FunctionParameter = new - { - Token = m_LoginInfo.EntityToken.EntityToken, - } + FunctionParameter = MakeFunctionParams() }, result => { diff --git a/Assets/Script/Table/table_chapterquest.cs b/Assets/Script/Table/table_chapterquest.cs index 46655a551..326514acd 100644 --- a/Assets/Script/Table/table_chapterquest.cs +++ b/Assets/Script/Table/table_chapterquest.cs @@ -71,8 +71,8 @@ public class table_chapterquest : MonoBehaviour var curChapter = MyValue.MyChoiceMapData.n_MapID; //return Get_DataList(curChapter)[chap++] as ChapterQuestTableData; // 테스트 : 챕터 퀘스트 - if (sdata.Get_Common(eCommon.GuideStep) <= 2 && sdata.Get_Common(eCommon.GuideCount) < 1) - return list_Data[0] as ChapterQuestTableData; + //if (sdata.Get_Common(eCommon.GuideStep) <= 2 && sdata.Get_Common(eCommon.GuideCount) < 1) + // return list_Data[0] as ChapterQuestTableData; //var maxchapter = sdata.Get_Common(eCommon.MaxMapID); //var maxstage = sdata.Get_Common(eCommon.MaxStage); diff --git a/Assets/Script/UI/Common/GuideQuestUI.cs b/Assets/Script/UI/Common/GuideQuestUI.cs index 38e4abb61..652a927d1 100644 --- a/Assets/Script/UI/Common/GuideQuestUI.cs +++ b/Assets/Script/UI/Common/GuideQuestUI.cs @@ -24,7 +24,7 @@ public class GuideQuestUI : MonoBehaviour public void Set() { var sdata = ServerInfo.Ins.m_ServerData; - var step = sdata.Get_Common(eCommon.GuideStep); + var step = sdata.GuideQuest.Step; // 쿠폰 입력이 있을 경우 #if UNITY_ANDROID @@ -110,23 +110,8 @@ public class GuideQuestUI : MonoBehaviour void Set_Count() { var sdata = ServerInfo.Ins.m_ServerData; - labels[3].text = $"{sdata.Get_Common(eCommon.GuideCount)}/{Tdata.l_MissionConditionCount}"; - gos[0].SetActive(sdata.Get_Common(eCommon.GuideCount) >= Tdata.l_MissionConditionCount); - } - - void Set_Complete() - { - gameObject.SetActive(false); - Tdata = null; - var sdata = ServerInfo.Ins.m_ServerData; - sdata.Set_Common(eCommon.GuideCount, 0); - sdata.Set_Common(eCommon.GuideStep, 39); - - //ServerInfo.Ins.GuideQuestComplete(() => - //{ - // m_GuideQuestComplete.Set(); - // GameUI.Ins.LobbyUI.Set_MailNoti(true); - //}); + labels[3].text = $"{sdata.GuideQuest.Count}/{Tdata.l_MissionConditionCount}"; + gos[0].SetActive(sdata.GuideQuest.Count >= Tdata.l_MissionConditionCount); } public void Add_GuideQuest(ePurpose _purpose, int _v) @@ -134,7 +119,7 @@ public class GuideQuestUI : MonoBehaviour if (!DSUtil.CheckNull(Tdata) && Tdata.e_MissionConditionType == _purpose) { var sdata = ServerInfo.Ins.m_ServerData; - sdata.Add_Common(eCommon.GuideCount, _v); + sdata.GuideQuest.Count += _v; Set_Count(); if (!showtoast && gos[0].activeSelf) { @@ -155,11 +140,11 @@ public class GuideQuestUI : MonoBehaviour public void OnClick_Reward() { var sdata = ServerInfo.Ins.m_ServerData; - if (sdata.Get_Common(eCommon.GuideCount) >= Tdata.l_MissionConditionCount) + if (sdata.GuideQuest.Count >= Tdata.l_MissionConditionCount) { showtoast = false; - sdata.Set_Common(eCommon.GuideCount, 0); - sdata.Add_Common(eCommon.GuideStep); + sdata.GuideQuest.Count = 0; + ++sdata.GuideQuest.Step; //GetItemUI.Ins.Set(sdata.Add_Item(new ItemData(Tdata.e_Reward, Tdata.n_RewardID, Tdata.n_RewardAmount, DSUtil.Format("guide {0}", Tdata.ID), eUICardType.GetItem))); //GetItemUI.Ins.Show_Items(); Set(); diff --git a/Assets/Script/UI/Shop_old/ShopEventCheck.cs b/Assets/Script/UI/Shop_old/ShopEventCheck.cs index 760e21493..31f8143b6 100644 --- a/Assets/Script/UI/Shop_old/ShopEventCheck.cs +++ b/Assets/Script/UI/Shop_old/ShopEventCheck.cs @@ -9,7 +9,7 @@ public class ShopEventCheck : MonoBehaviourSingletonTemplate // Start is called before the first frame update void Start() { - if (ServerInfo.Ins.m_ServerData.Get_Common(eCommon.GuideStep) < 26 || grid_shopevent.transform.childCount == 0) + if (ServerInfo.Ins.m_ServerData.GuideQuest.Step < 26 || grid_shopevent.transform.childCount == 0) gameObject.SetActive(false); } } \ No newline at end of file diff --git a/Assets/Script/Util/MyEnum.cs b/Assets/Script/Util/MyEnum.cs index 990cf7e18..70c9c02f3 100644 --- a/Assets/Script/Util/MyEnum.cs +++ b/Assets/Script/Util/MyEnum.cs @@ -196,7 +196,9 @@ public enum eStat public enum eFarmerStat { MoveSpeed, DanceCoolTime } public enum eCommon { - Agree, Noti, NightNoti, DOY_Day, DOY_Week, DOY_Month, PlayTime, Auto, FirstStatInit, ADRemove, GuideStep, GuideCount, + Agree, Noti, NightNoti, DOY_Day, DOY_Week, DOY_Month, PlayTime, Auto, FirstStatInit, ADRemove, + + NoUse1, NoUse2, NickChange, X2, CloverShopResetTime, CloverShopID_Weapon, CloverShopID_Ring, CloverShopID_Neck, CloverShopID_Boots, CloverShopID_Fairy, CloverShopID_Magic, CloverShopID_Pet, InAppBuyCount, FieldFirstFree, Roullette_Ticket, Roullette_Count, Roullette_ADCount, Roullette_LuckyCount, AttendanceStep, AttendanceDOY, diff --git a/Assets/Script/Util/MyValue.cs b/Assets/Script/Util/MyValue.cs index b6ec858e9..5d6f87681 100644 --- a/Assets/Script/Util/MyValue.cs +++ b/Assets/Script/Util/MyValue.cs @@ -213,7 +213,7 @@ public static class MyValue //if (ServerInfo.Ins.m_ServerData.Get_Common(eCommon.MaxMapID) >= 10) return true; return false; } - if (ServerInfo.Ins.m_ServerData.Get_Common(eCommon.GuideStep) >= someVal) return true; + if (ServerInfo.Ins.m_ServerData.GuideQuest.Step >= someVal) return true; if (_showToast) ToastUI.Ins.Set(175, someVal); return false;