NerdNavis_AiDev
/
Project_WL
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

가퀘 작업 중... 클라->서버 공통 데이터

This commit is contained in:
Ino 2025-08-08 04:37:32 +09:00
parent a6c8138e51
commit 966f37999c
8 changed files with 279 additions and 312 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Assets/PlayFabEditorExtensions/Editor/Resources/.CloudScript.js
View File

@ -198,6 +198,7 @@ function Create_NewUserData() {
data.Gacha = {}; data.Gacha = {};
data.Shop = {}; data.Shop = {};
data.LimitBreakOption = { Preset: [0,0,0], Option: {} } data.LimitBreakOption = { Preset: [0,0,0], Option: {} }
Set_GuideQuest(data);
return data; return data;
} }
@ -367,6 +368,12 @@ function Init_Farm() {
Shop: {} 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) handlers.Get_OtherUserInfo = function (args)
{ {

19
Assets/Script/Server/ServerClass.cs
View File

@ -40,6 +40,7 @@ public class SC_MyResult { public int result; }
public partial class ServerData public partial class ServerData
{ {
public DateTime LastTime; public DateTime LastTime;
public SD_GuideQuest GuideQuest;
public List<ObscuredInt> Common; public List<ObscuredInt> Common;
/// <summary> /// <summary>
/// { 맵 ID, { 난이도, 데이터 } } /// { 맵 ID, { 난이도, 데이터 } }
@ -256,6 +257,7 @@ public partial class ServerData
public class ServerData_Read public class ServerData_Read
{ {
public DateTime LastTime; public DateTime LastTime;
public SD_GuideQuest GuideQuest;
public Dictionary<string, Dictionary<string, SD_MapData_Read>> MapData = new Dictionary<string, Dictionary<string, SD_MapData_Read>>(); public Dictionary<string, Dictionary<string, SD_MapData_Read>> MapData = new Dictionary<string, Dictionary<string, SD_MapData_Read>>();
public SD_Buff_Read Buff; public SD_Buff_Read Buff;
public SD_Equip_Read Equip; public SD_Equip_Read Equip;
@ -293,6 +295,7 @@ public class ServerData_Read
ServerData temp = new ServerData(); ServerData temp = new ServerData();
temp.IsEnemy = _isEnemy; temp.IsEnemy = _isEnemy;
temp.LastTime = LastTime; temp.LastTime = LastTime;
temp.GuideQuest = GuideQuest;
temp.MapData = new Dictionary<string, Dictionary<string, SD_MapData>>(); temp.MapData = new Dictionary<string, Dictionary<string, SD_MapData>>();
foreach (var item in MapData) foreach (var item in MapData)
{ {
@ -2301,6 +2304,22 @@ public class ServerData_ChapterQuest_Read
#endregion #endregion
#region New 데이터 클래스 #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 class SD_Equip
{ {
public Dictionary<eItem, ObscuredInt> Equip; public Dictionary<eItem, ObscuredInt> Equip;

524
Assets/Script/Server/ServerInfo.cs
View File

@ -11,6 +11,8 @@ using System.Collections.Generic;
using System.Reflection; using System.Reflection;
using UnityEngine; using UnityEngine;
using UnityEngine.Networking; using UnityEngine.Networking;
using static InvBaseItem;
using static UnityEngine.Rendering.VolumeComponent;
using Random = UnityEngine.Random; using Random = UnityEngine.Random;
public class ServerInfo : MyCoroutine public class ServerInfo : MyCoroutine
@ -726,6 +728,23 @@ public class ServerInfo : MyCoroutine
public bool IsNewUser() { return string.IsNullOrEmpty(UserName); } public bool IsNewUser() { return string.IsNullOrEmpty(UserName); }
#region 신규 서버 #region 신규 서버
private Dictionary<string, object> MakeFunctionParams(Dictionary<string, object> extraParams = null)
{
var param = new Dictionary<string, object>
{
{ "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) public void Save_CheatItem(int itemid, double amount, Action _act = null)
{ {
NetWait.Ins.Set(true); NetWait.Ins.Set(true);
@ -733,12 +752,11 @@ public class ServerInfo : MyCoroutine
{ {
FunctionName = MethodBase.GetCurrentMethod().Name, FunctionName = MethodBase.GetCurrentMethod().Name,
GeneratePlayStreamEvent = true, GeneratePlayStreamEvent = true,
FunctionParameter = new FunctionParameter = MakeFunctionParams(new Dictionary<string, object>
{ {
Token = m_LoginInfo.EntityToken.EntityToken, { "ID", itemid },
ID = itemid, { "Amount", amount }
Amount = amount })
}
}, },
result => result =>
{ {
@ -762,10 +780,7 @@ public class ServerInfo : MyCoroutine
{ {
FunctionName = MethodBase.GetCurrentMethod().Name, FunctionName = MethodBase.GetCurrentMethod().Name,
GeneratePlayStreamEvent = true, GeneratePlayStreamEvent = true,
FunctionParameter = new FunctionParameter = MakeFunctionParams()
{
Token = m_LoginInfo.EntityToken.EntityToken,
}
}, },
result => result =>
{ {
@ -811,22 +826,21 @@ public class ServerInfo : MyCoroutine
{ {
FunctionName = MethodBase.GetCurrentMethod().Name, FunctionName = MethodBase.GetCurrentMethod().Name,
GeneratePlayStreamEvent = true, GeneratePlayStreamEvent = true,
FunctionParameter = new FunctionParameter = MakeFunctionParams(new Dictionary<string, object>
{ {
Token = m_LoginInfo.EntityToken.EntityToken, { "Diff", MyValue.MyChoiceMapData.n_Difficult },
Diff = MyValue.MyChoiceMapData.n_Difficult, { "MapID", MyValue.MyChoiceMapData.n_MapID },
MapID = MyValue.MyChoiceMapData.n_MapID, { "Exp", DropItemInfo.Ins.m_StageDropData.GetExp.GetDecrypted() },
Exp = DropItemInfo.Ins.m_StageDropData.GetExp.GetDecrypted(), { "UseGold", DropItemInfo.Ins.m_StageDropData.UseGold.GetDecrypted() },
UseGold = DropItemInfo.Ins.m_StageDropData.UseGold.GetDecrypted(), { "AddStatSTR", DropItemInfo.Ins.m_StageDropData.Get_MainStat(eMainStatType.STR) },
AddStatSTR = DropItemInfo.Ins.m_StageDropData.Get_MainStat(eMainStatType.STR), { "AddStatDEX", DropItemInfo.Ins.m_StageDropData.Get_MainStat(eMainStatType.DEX) },
AddStatDEX = DropItemInfo.Ins.m_StageDropData.Get_MainStat(eMainStatType.DEX), { "AddStatINT", DropItemInfo.Ins.m_StageDropData.Get_MainStat(eMainStatType.INT) },
AddStatINT = DropItemInfo.Ins.m_StageDropData.Get_MainStat(eMainStatType.INT), { "Item", items },
Item = items, { "Mob", MobKill },
Mob = MobKill, { "Elite", EliteKill },
Elite = EliteKill, { "Boss", BossKill },
Boss = BossKill, { "Auto", m_ServerData.Get_Common(eCommon.Auto) }
Auto = m_ServerData.Get_Common(eCommon.Auto), })
}
}, },
result => result =>
{ {
@ -850,41 +864,6 @@ public class ServerInfo : MyCoroutine
Set_Coroutine(() => { Save_StageResult(_act); }, 2f); Set_Coroutine(() => { Save_StageResult(_act); }, 2f);
}); });
} }
public void Save_MimicResult(bool? win, int lv, Action<int> _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) public void Save_DungeonStart(int ticketid, Action _act)
{ {
NetWait.Ins.Set(true); NetWait.Ins.Set(true);
@ -892,11 +871,10 @@ public class ServerInfo : MyCoroutine
{ {
FunctionName = MethodBase.GetCurrentMethod().Name, FunctionName = MethodBase.GetCurrentMethod().Name,
GeneratePlayStreamEvent = true, GeneratePlayStreamEvent = true,
FunctionParameter = new FunctionParameter = MakeFunctionParams(new Dictionary<string, object>
{ {
Token = m_LoginInfo.EntityToken.EntityToken, { "TicketID", ticketid },
TicketID = ticketid, })
}
}, },
result => result =>
{ {
@ -919,6 +897,40 @@ public class ServerInfo : MyCoroutine
Set_Coroutine(() => { Save_DungeonStart(ticketid, _act); }, 2f); Set_Coroutine(() => { Save_DungeonStart(ticketid, _act); }, 2f);
}); });
} }
public void Save_MimicResult(bool? win, int lv, Action<int> _act)
{
NetWait.Ins.Set(true);
PlayFabClientAPI.ExecuteCloudScript(new ExecuteCloudScriptRequest
{
FunctionName = MethodBase.GetCurrentMethod().Name,
GeneratePlayStreamEvent = true,
FunctionParameter = MakeFunctionParams(new Dictionary<string, object>
{
{ "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<int> _act) public void Save_MazeResult(int nextfloor, Action<int> _act)
{ {
NetWait.Ins.Set(true); NetWait.Ins.Set(true);
@ -926,11 +938,10 @@ public class ServerInfo : MyCoroutine
{ {
FunctionName = MethodBase.GetCurrentMethod().Name, FunctionName = MethodBase.GetCurrentMethod().Name,
GeneratePlayStreamEvent = true, GeneratePlayStreamEvent = true,
FunctionParameter = new FunctionParameter = MakeFunctionParams(new Dictionary<string, object>
{ {
Token = m_LoginInfo.EntityToken.EntityToken, { "NextFloor", nextfloor },
NextFloor = nextfloor, })
}
}, },
result => result =>
{ {
@ -960,11 +971,10 @@ public class ServerInfo : MyCoroutine
{ {
FunctionName = MethodBase.GetCurrentMethod().Name, FunctionName = MethodBase.GetCurrentMethod().Name,
GeneratePlayStreamEvent = true, GeneratePlayStreamEvent = true,
FunctionParameter = new FunctionParameter = MakeFunctionParams(new Dictionary<string, object>
{ {
Token = m_LoginInfo.EntityToken.EntityToken, { "Dmg", dmg },
Dmg = dmg, })
}
}, },
result => result =>
{ {
@ -990,11 +1000,10 @@ public class ServerInfo : MyCoroutine
{ {
FunctionName = MethodBase.GetCurrentMethod().Name, FunctionName = MethodBase.GetCurrentMethod().Name,
GeneratePlayStreamEvent = true, GeneratePlayStreamEvent = true,
FunctionParameter = new FunctionParameter = MakeFunctionParams(new Dictionary<string, object>
{ {
Token = m_LoginInfo.EntityToken.EntityToken, { "Point", point },
Point = point, })
}
}, },
result => result =>
{ {
@ -1022,15 +1031,14 @@ public class ServerInfo : MyCoroutine
{ {
FunctionName = MethodBase.GetCurrentMethod().Name, FunctionName = MethodBase.GetCurrentMethod().Name,
GeneratePlayStreamEvent = true, GeneratePlayStreamEvent = true,
FunctionParameter = new FunctionParameter = MakeFunctionParams(new Dictionary<string, object>
{ {
Token = m_LoginInfo.EntityToken.EntityToken, { "CostumeID", costumeid },
CostumeID = costumeid, { "WorkerID", workerid },
WorkerID = workerid, { "JobID", jobid },
JobID = jobid, { "AwakenData", awakenData },
AwakenData = awakenData, { "LimitSlotData", limitslotData },
LimitSlotData = limitslotData })
}
}, },
result => result =>
{ {
@ -1064,11 +1072,10 @@ public class ServerInfo : MyCoroutine
{ {
FunctionName = MethodBase.GetCurrentMethod().Name, FunctionName = MethodBase.GetCurrentMethod().Name,
GeneratePlayStreamEvent = true, GeneratePlayStreamEvent = true,
FunctionParameter = new FunctionParameter = MakeFunctionParams(new Dictionary<string, object>
{ {
Token = m_LoginInfo.EntityToken.EntityToken, { "UsePoint", usepoint },
UsePoint = usepoint, })
}
}, },
result => result =>
{ {
@ -1098,10 +1105,7 @@ public class ServerInfo : MyCoroutine
{ {
FunctionName = MethodBase.GetCurrentMethod().Name, FunctionName = MethodBase.GetCurrentMethod().Name,
GeneratePlayStreamEvent = true, GeneratePlayStreamEvent = true,
FunctionParameter = new FunctionParameter = MakeFunctionParams()
{
Token = m_LoginInfo.EntityToken.EntityToken,
}
}, },
result => result =>
{ {
@ -1137,12 +1141,11 @@ public class ServerInfo : MyCoroutine
{ {
FunctionName = MethodBase.GetCurrentMethod().Name, FunctionName = MethodBase.GetCurrentMethod().Name,
GeneratePlayStreamEvent = true, GeneratePlayStreamEvent = true,
FunctionParameter = new FunctionParameter = MakeFunctionParams(new Dictionary<string, object>
{ {
Token = m_LoginInfo.EntityToken.EntityToken, { "AbilityID", abilityID },
AbilityID = abilityID, { "nBattleType", nbattletype },
nBattleType = nbattletype, })
}
}, },
result => result =>
{ {
@ -1175,11 +1178,10 @@ public class ServerInfo : MyCoroutine
{ {
FunctionName = MethodBase.GetCurrentMethod().Name, FunctionName = MethodBase.GetCurrentMethod().Name,
GeneratePlayStreamEvent = true, GeneratePlayStreamEvent = true,
FunctionParameter = new FunctionParameter = MakeFunctionParams(new Dictionary<string, object>
{ {
Token = m_LoginInfo.EntityToken.EntityToken, { "BattleType", battleType },
BattleType = battleType, })
}
}, },
result => result =>
{ {
@ -1215,11 +1217,10 @@ public class ServerInfo : MyCoroutine
{ {
FunctionName = MethodBase.GetCurrentMethod().Name, FunctionName = MethodBase.GetCurrentMethod().Name,
GeneratePlayStreamEvent = true, GeneratePlayStreamEvent = true,
FunctionParameter = new FunctionParameter = MakeFunctionParams(new Dictionary<string, object>
{ {
Token = m_LoginInfo.EntityToken.EntityToken, { "JobID", jobid },
JobID = jobid, })
}
}, },
result => result =>
{ {
@ -1254,10 +1255,7 @@ public class ServerInfo : MyCoroutine
{ {
FunctionName = MethodBase.GetCurrentMethod().Name, FunctionName = MethodBase.GetCurrentMethod().Name,
GeneratePlayStreamEvent = true, GeneratePlayStreamEvent = true,
FunctionParameter = new FunctionParameter = MakeFunctionParams()
{
Token = m_LoginInfo.EntityToken.EntityToken,
}
}, },
result => result =>
{ {
@ -1292,11 +1290,10 @@ public class ServerInfo : MyCoroutine
{ {
FunctionName = MethodBase.GetCurrentMethod().Name, FunctionName = MethodBase.GetCurrentMethod().Name,
GeneratePlayStreamEvent = true, GeneratePlayStreamEvent = true,
FunctionParameter = new FunctionParameter = MakeFunctionParams(new Dictionary<string, object>
{ {
Token = m_LoginInfo.EntityToken.EntityToken, { "LimitSlotData", lsd },
LimitSlotData = lsd })
}
}, },
result => result =>
{ {
@ -1328,11 +1325,10 @@ public class ServerInfo : MyCoroutine
{ {
FunctionName = MethodBase.GetCurrentMethod().Name, FunctionName = MethodBase.GetCurrentMethod().Name,
GeneratePlayStreamEvent = true, GeneratePlayStreamEvent = true,
FunctionParameter = new FunctionParameter = MakeFunctionParams(new Dictionary<string, object>
{ {
Token = m_LoginInfo.EntityToken.EntityToken, { "Preset", preset },
Preset = preset })
}
}, },
result => result =>
{ {
@ -1370,12 +1366,11 @@ public class ServerInfo : MyCoroutine
{ {
FunctionName = MethodBase.GetCurrentMethod().Name, FunctionName = MethodBase.GetCurrentMethod().Name,
GeneratePlayStreamEvent = true, GeneratePlayStreamEvent = true,
FunctionParameter = new FunctionParameter = MakeFunctionParams(new Dictionary<string, object>
{ {
Token = m_LoginInfo.EntityToken.EntityToken, { "Preset", preset },
Preset = preset, { "Slot", slot },
Slot = slot, })
}
}, },
result => result =>
{ {
@ -1407,11 +1402,10 @@ public class ServerInfo : MyCoroutine
{ {
FunctionName = MethodBase.GetCurrentMethod().Name, FunctionName = MethodBase.GetCurrentMethod().Name,
GeneratePlayStreamEvent = true, GeneratePlayStreamEvent = true,
FunctionParameter = new FunctionParameter = MakeFunctionParams(new Dictionary<string, object>
{ {
Token = m_LoginInfo.EntityToken.EntityToken, { "ItemID", itemid },
ItemID = itemid, })
}
}, },
result => result =>
{ {
@ -1444,11 +1438,10 @@ public class ServerInfo : MyCoroutine
{ {
FunctionName = MethodBase.GetCurrentMethod().Name, FunctionName = MethodBase.GetCurrentMethod().Name,
GeneratePlayStreamEvent = true, GeneratePlayStreamEvent = true,
FunctionParameter = new FunctionParameter = MakeFunctionParams(new Dictionary<string, object>
{ {
Token = m_LoginInfo.EntityToken.EntityToken, { "ItemID", itemid },
ItemID = itemid, })
}
}, },
result => result =>
{ {
@ -1480,11 +1473,10 @@ public class ServerInfo : MyCoroutine
{ {
FunctionName = MethodBase.GetCurrentMethod().Name, FunctionName = MethodBase.GetCurrentMethod().Name,
GeneratePlayStreamEvent = true, GeneratePlayStreamEvent = true,
FunctionParameter = new FunctionParameter = MakeFunctionParams(new Dictionary<string, object>
{ {
Token = m_LoginInfo.EntityToken.EntityToken, { "ItemID", itemid },
ItemID = itemid, })
}
}, },
result => result =>
{ {
@ -1518,12 +1510,11 @@ public class ServerInfo : MyCoroutine
{ {
FunctionName = MethodBase.GetCurrentMethod().Name, FunctionName = MethodBase.GetCurrentMethod().Name,
GeneratePlayStreamEvent = true, GeneratePlayStreamEvent = true,
FunctionParameter = new FunctionParameter = MakeFunctionParams(new Dictionary<string, object>
{ {
Token = m_LoginInfo.EntityToken.EntityToken, { "ItemID", itemid },
ItemID = itemid, { "Count", count },
Count = count, })
}
}, },
result => result =>
{ {
@ -1556,11 +1547,10 @@ public class ServerInfo : MyCoroutine
{ {
FunctionName = MethodBase.GetCurrentMethod().Name, FunctionName = MethodBase.GetCurrentMethod().Name,
GeneratePlayStreamEvent = true, GeneratePlayStreamEvent = true,
FunctionParameter = new FunctionParameter = MakeFunctionParams(new Dictionary<string, object>
{ {
Token = m_LoginInfo.EntityToken.EntityToken, { "ItemID", itemid },
ItemID = itemid, })
}
}, },
result => result =>
{ {
@ -1594,11 +1584,10 @@ public class ServerInfo : MyCoroutine
{ {
FunctionName = MethodBase.GetCurrentMethod().Name, FunctionName = MethodBase.GetCurrentMethod().Name,
GeneratePlayStreamEvent = true, GeneratePlayStreamEvent = true,
FunctionParameter = new FunctionParameter = MakeFunctionParams(new Dictionary<string, object>
{ {
Token = m_LoginInfo.EntityToken.EntityToken, { "ItemID", itemid },
ItemID = itemid, })
}
}, },
result => result =>
{ {
@ -1632,12 +1621,11 @@ public class ServerInfo : MyCoroutine
{ {
FunctionName = MethodBase.GetCurrentMethod().Name, FunctionName = MethodBase.GetCurrentMethod().Name,
GeneratePlayStreamEvent = true, GeneratePlayStreamEvent = true,
FunctionParameter = new FunctionParameter = MakeFunctionParams(new Dictionary<string, object>
{ {
Token = m_LoginInfo.EntityToken.EntityToken, { "EquipMenuData", data },
EquipMenuData = data, { "NeedOptionid", needoptionid },
NeedOptionid = needoptionid })
}
}, },
result => result =>
{ {
@ -1673,13 +1661,12 @@ public class ServerInfo : MyCoroutine
{ {
FunctionName = MethodBase.GetCurrentMethod().Name, FunctionName = MethodBase.GetCurrentMethod().Name,
GeneratePlayStreamEvent = true, GeneratePlayStreamEvent = true,
FunctionParameter = new FunctionParameter = MakeFunctionParams(new Dictionary<string, object>
{ {
Token = m_LoginInfo.EntityToken.EntityToken, { "ItemID", itemid },
ItemID = itemid, { "EnchantID", eid },
EnchantID = eid, { "Slot", slot },
Slot = slot })
}
}, },
result => result =>
{ {
@ -1714,11 +1701,10 @@ public class ServerInfo : MyCoroutine
{ {
FunctionName = MethodBase.GetCurrentMethod().Name, FunctionName = MethodBase.GetCurrentMethod().Name,
GeneratePlayStreamEvent = true, GeneratePlayStreamEvent = true,
FunctionParameter = new FunctionParameter = MakeFunctionParams(new Dictionary<string, object>
{ {
Token = m_LoginInfo.EntityToken.EntityToken, { "EquipMenuData", data },
EquipMenuData = data, })
}
}, },
result => result =>
{ {
@ -1745,11 +1731,10 @@ public class ServerInfo : MyCoroutine
{ {
FunctionName = MethodBase.GetCurrentMethod().Name, FunctionName = MethodBase.GetCurrentMethod().Name,
GeneratePlayStreamEvent = true, GeneratePlayStreamEvent = true,
FunctionParameter = new FunctionParameter = MakeFunctionParams(new Dictionary<string, object>
{ {
Token = m_LoginInfo.EntityToken.EntityToken, { "EnchantID", eid },
EnchantID = eid, })
}
}, },
result => result =>
{ {
@ -1782,14 +1767,13 @@ public class ServerInfo : MyCoroutine
{ {
FunctionName = MethodBase.GetCurrentMethod().Name, FunctionName = MethodBase.GetCurrentMethod().Name,
GeneratePlayStreamEvent = true, GeneratePlayStreamEvent = true,
FunctionParameter = new FunctionParameter = MakeFunctionParams(new Dictionary<string, object>
{ {
Token = m_LoginInfo.EntityToken.EntityToken, { "Preset", preset },
Preset = preset, { "Skills1", skills[1] },
Skills1 = skills[1], { "Skills2", skills[2] },
Skills2 = skills[2], { "Skills3", skills[3] },
Skills3 = skills[3], })
}
}, },
result => result =>
{ {
@ -1819,11 +1803,10 @@ public class ServerInfo : MyCoroutine
{ {
FunctionName = MethodBase.GetCurrentMethod().Name, FunctionName = MethodBase.GetCurrentMethod().Name,
GeneratePlayStreamEvent = true, GeneratePlayStreamEvent = true,
FunctionParameter = new FunctionParameter = MakeFunctionParams(new Dictionary<string, object>
{ {
Token = m_LoginInfo.EntityToken.EntityToken, { "SkillID", skillid },
SkillID = skillid, })
}
}, },
result => result =>
{ {
@ -1895,12 +1878,11 @@ public class ServerInfo : MyCoroutine
{ {
FunctionName = MethodBase.GetCurrentMethod().Name, FunctionName = MethodBase.GetCurrentMethod().Name,
GeneratePlayStreamEvent = true, GeneratePlayStreamEvent = true,
FunctionParameter = new FunctionParameter = MakeFunctionParams(new Dictionary<string, object>
{ {
Token = m_LoginInfo.EntityToken.EntityToken, { "PetID", petid },
PetID = petid, { "MenuBackData", data },
MenuBackData = data, })
}
}, },
result => result =>
{ {
@ -1926,12 +1908,11 @@ public class ServerInfo : MyCoroutine
{ {
FunctionName = MethodBase.GetCurrentMethod().Name, FunctionName = MethodBase.GetCurrentMethod().Name,
GeneratePlayStreamEvent = true, GeneratePlayStreamEvent = true,
FunctionParameter = new FunctionParameter = MakeFunctionParams(new Dictionary<string, object>
{ {
Token = m_LoginInfo.EntityToken.EntityToken, { "AD", isad },
AD = isad, { "Amount", amount },
Amount = amount, })
}
}, },
result => result =>
{ {
@ -1956,6 +1937,7 @@ public class ServerInfo : MyCoroutine
Set_Coroutine(() => { Save_Pet_Gacha(isad, amount, _act); }, 2f); Set_Coroutine(() => { Save_Pet_Gacha(isad, amount, _act); }, 2f);
}); });
} }
[Obsolete("Use Save_Pet_MenuBack Instead")]
public void Save_Pet_LvUp(int petid, Action<SC_PetLvUpResult> _act) public void Save_Pet_LvUp(int petid, Action<SC_PetLvUpResult> _act)
{ {
NetWait.Ins.Set(true); NetWait.Ins.Set(true);
@ -1963,11 +1945,10 @@ public class ServerInfo : MyCoroutine
{ {
FunctionName = MethodBase.GetCurrentMethod().Name, FunctionName = MethodBase.GetCurrentMethod().Name,
GeneratePlayStreamEvent = true, GeneratePlayStreamEvent = true,
FunctionParameter = new FunctionParameter = MakeFunctionParams(new Dictionary<string, object>
{ {
Token = m_LoginInfo.EntityToken.EntityToken, { "PetID", petid },
PetID = petid, })
}
}, },
result => result =>
{ {
@ -1993,6 +1974,7 @@ public class ServerInfo : MyCoroutine
Set_Coroutine(() => { Save_Pet_LvUp(petid, _act); }, 2f); Set_Coroutine(() => { Save_Pet_LvUp(petid, _act); }, 2f);
}); });
} }
[Obsolete("Use Save_Pet_MenuBack Instead")]
public void Save_Pet_Equip(int petid, Action _act) public void Save_Pet_Equip(int petid, Action _act)
{ {
NetWait.Ins.Set(true); NetWait.Ins.Set(true);
@ -2000,11 +1982,10 @@ public class ServerInfo : MyCoroutine
{ {
FunctionName = MethodBase.GetCurrentMethod().Name, FunctionName = MethodBase.GetCurrentMethod().Name,
GeneratePlayStreamEvent = true, GeneratePlayStreamEvent = true,
FunctionParameter = new FunctionParameter = MakeFunctionParams(new Dictionary<string, object>
{ {
Token = m_LoginInfo.EntityToken.EntityToken, { "PetID", petid },
PetID = petid, })
}
}, },
result => result =>
{ {
@ -2036,12 +2017,11 @@ public class ServerInfo : MyCoroutine
{ {
FunctionName = MethodBase.GetCurrentMethod().Name, FunctionName = MethodBase.GetCurrentMethod().Name,
GeneratePlayStreamEvent = true, GeneratePlayStreamEvent = true,
FunctionParameter = new FunctionParameter = MakeFunctionParams(new Dictionary<string, object>
{ {
Token = m_LoginInfo.EntityToken.EntityToken, { "EssenceID", essenceID },
EssenceID = essenceID, { "Amount", amount },
Amount = amount, })
}
}, },
result => result =>
{ {
@ -2072,10 +2052,7 @@ public class ServerInfo : MyCoroutine
{ {
FunctionName = MethodBase.GetCurrentMethod().Name, FunctionName = MethodBase.GetCurrentMethod().Name,
GeneratePlayStreamEvent = true, GeneratePlayStreamEvent = true,
FunctionParameter = new FunctionParameter = MakeFunctionParams()
{
Token = m_LoginInfo.EntityToken.EntityToken,
}
}, },
result => result =>
{ {
@ -2107,11 +2084,10 @@ public class ServerInfo : MyCoroutine
{ {
FunctionName = MethodBase.GetCurrentMethod().Name, FunctionName = MethodBase.GetCurrentMethod().Name,
GeneratePlayStreamEvent = true, GeneratePlayStreamEvent = true,
FunctionParameter = new FunctionParameter = MakeFunctionParams(new Dictionary<string, object>
{ {
Token = m_LoginInfo.EntityToken.EntityToken, { "RelicID", relicid },
RelicID = relicid, })
}
}, },
result => result =>
{ {
@ -2145,11 +2121,10 @@ public class ServerInfo : MyCoroutine
{ {
FunctionName = MethodBase.GetCurrentMethod().Name, FunctionName = MethodBase.GetCurrentMethod().Name,
GeneratePlayStreamEvent = true, GeneratePlayStreamEvent = true,
FunctionParameter = new FunctionParameter = MakeFunctionParams(new Dictionary<string, object>
{ {
Token = m_LoginInfo.EntityToken.EntityToken, { "RelicID", relicid },
RelicID = relicid, })
}
}, },
result => result =>
{ {
@ -2185,12 +2160,11 @@ public class ServerInfo : MyCoroutine
{ {
FunctionName = MethodBase.GetCurrentMethod().Name, FunctionName = MethodBase.GetCurrentMethod().Name,
GeneratePlayStreamEvent = true, GeneratePlayStreamEvent = true,
FunctionParameter = new FunctionParameter = MakeFunctionParams(new Dictionary<string, object>
{ {
Token = m_LoginInfo.EntityToken.EntityToken, { "Condition", condition },
Condition = condition, { "Category", eMenuCategory },
Category = eMenuCategory, })
}
}, },
result => result =>
{ {
@ -2222,12 +2196,11 @@ public class ServerInfo : MyCoroutine
{ {
FunctionName = MethodBase.GetCurrentMethod().Name, FunctionName = MethodBase.GetCurrentMethod().Name,
GeneratePlayStreamEvent = true, GeneratePlayStreamEvent = true,
FunctionParameter = new FunctionParameter = MakeFunctionParams(new Dictionary<string, object>
{ {
Token = m_LoginInfo.EntityToken.EntityToken, { "GachaID", id },
GachaID = id, { "Count", count },
Count = count, })
}
}, },
result => result =>
{ {
@ -2258,12 +2231,11 @@ public class ServerInfo : MyCoroutine
{ {
FunctionName = MethodBase.GetCurrentMethod().Name, FunctionName = MethodBase.GetCurrentMethod().Name,
GeneratePlayStreamEvent = true, GeneratePlayStreamEvent = true,
FunctionParameter = new FunctionParameter = MakeFunctionParams(new Dictionary<string, object>
{ {
Token = m_LoginInfo.EntityToken.EntityToken, { "GachaID", id },
GachaID = id, { "SelectItemID", itemid },
SelectItemID = itemid, })
}
}, },
result => result =>
{ {
@ -2296,11 +2268,10 @@ public class ServerInfo : MyCoroutine
{ {
FunctionName = MethodBase.GetCurrentMethod().Name, FunctionName = MethodBase.GetCurrentMethod().Name,
GeneratePlayStreamEvent = true, GeneratePlayStreamEvent = true,
FunctionParameter = new FunctionParameter = MakeFunctionParams(new Dictionary<string, object>
{ {
Token = m_LoginInfo.EntityToken.EntityToken, { "CostumeID", id },
CostumeID = id, })
}
}, },
result => result =>
{ {
@ -2333,11 +2304,10 @@ public class ServerInfo : MyCoroutine
{ {
FunctionName = MethodBase.GetCurrentMethod().Name, FunctionName = MethodBase.GetCurrentMethod().Name,
GeneratePlayStreamEvent = true, GeneratePlayStreamEvent = true,
FunctionParameter = new FunctionParameter = MakeFunctionParams(new Dictionary<string, object>
{ {
Token = m_LoginInfo.EntityToken.EntityToken, { "WorkerID", id },
WorkerID = id, })
}
}, },
result => result =>
{ {
@ -2370,12 +2340,11 @@ public class ServerInfo : MyCoroutine
{ {
FunctionName = MethodBase.GetCurrentMethod().Name, FunctionName = MethodBase.GetCurrentMethod().Name,
GeneratePlayStreamEvent = true, GeneratePlayStreamEvent = true,
FunctionParameter = new FunctionParameter = MakeFunctionParams(new Dictionary<string, object>
{ {
Token = m_LoginInfo.EntityToken.EntityToken, { "Group", group },
Group = group, { "ID", id },
ID = id, })
}
}, },
result => result =>
{ {
@ -2406,11 +2375,10 @@ public class ServerInfo : MyCoroutine
{ {
FunctionName = MethodBase.GetCurrentMethod().Name, FunctionName = MethodBase.GetCurrentMethod().Name,
GeneratePlayStreamEvent = true, GeneratePlayStreamEvent = true,
FunctionParameter = new FunctionParameter = MakeFunctionParams(new Dictionary<string, object>
{ {
Token = m_LoginInfo.EntityToken.EntityToken, { "Group", group },
Group = group, })
}
}, },
result => result =>
{ {
@ -2442,11 +2410,10 @@ public class ServerInfo : MyCoroutine
{ {
FunctionName = MethodBase.GetCurrentMethod().Name, FunctionName = MethodBase.GetCurrentMethod().Name,
GeneratePlayStreamEvent = true, GeneratePlayStreamEvent = true,
FunctionParameter = new FunctionParameter = MakeFunctionParams(new Dictionary<string, object>
{ {
Token = m_LoginInfo.EntityToken.EntityToken, { "Index", index },
Index = index, })
}
}, },
result => result =>
{ {
@ -2478,12 +2445,11 @@ public class ServerInfo : MyCoroutine
{ {
FunctionName = MethodBase.GetCurrentMethod().Name, FunctionName = MethodBase.GetCurrentMethod().Name,
GeneratePlayStreamEvent = true, GeneratePlayStreamEvent = true,
FunctionParameter = new FunctionParameter = MakeFunctionParams(new Dictionary<string, object>
{ {
Token = m_LoginInfo.EntityToken.EntityToken, { "Slot", slot },
Slot = slot, { "EnchantID", enchantid },
EnchantID = enchantid, })
}
}, },
result => result =>
{ {
@ -2516,11 +2482,10 @@ public class ServerInfo : MyCoroutine
{ {
FunctionName = MethodBase.GetCurrentMethod().Name, FunctionName = MethodBase.GetCurrentMethod().Name,
GeneratePlayStreamEvent = true, GeneratePlayStreamEvent = true,
FunctionParameter = new FunctionParameter = MakeFunctionParams(new Dictionary<string, object>
{ {
Token = m_LoginInfo.EntityToken.EntityToken, { "Slot", slot },
Slot = slot, })
}
}, },
result => result =>
{ {
@ -2552,11 +2517,10 @@ public class ServerInfo : MyCoroutine
{ {
FunctionName = MethodBase.GetCurrentMethod().Name, FunctionName = MethodBase.GetCurrentMethod().Name,
GeneratePlayStreamEvent = true, GeneratePlayStreamEvent = true,
FunctionParameter = new FunctionParameter = MakeFunctionParams(new Dictionary<string, object>
{ {
Token = m_LoginInfo.EntityToken.EntityToken, { "Slot", slot },
Slot = slot, })
}
}, },
result => result =>
{ {
@ -2589,12 +2553,11 @@ public class ServerInfo : MyCoroutine
{ {
FunctionName = MethodBase.GetCurrentMethod().Name, FunctionName = MethodBase.GetCurrentMethod().Name,
GeneratePlayStreamEvent = true, GeneratePlayStreamEvent = true,
FunctionParameter = new FunctionParameter = MakeFunctionParams(new Dictionary<string, object>
{ {
Token = m_LoginInfo.EntityToken.EntityToken, { "FruitID", id },
FruitID = id, { "Amount", amount },
Amount = amount })
}
}, },
result => result =>
{ {
@ -2625,11 +2588,10 @@ public class ServerInfo : MyCoroutine
{ {
FunctionName = MethodBase.GetCurrentMethod().Name, FunctionName = MethodBase.GetCurrentMethod().Name,
GeneratePlayStreamEvent = true, GeneratePlayStreamEvent = true,
FunctionParameter = new FunctionParameter = MakeFunctionParams(new Dictionary<string, object>
{ {
Token = m_LoginInfo.EntityToken.EntityToken, { "FarmerID", id },
FarmerID = id, })
}
}, },
result => result =>
{ {
@ -2660,11 +2622,10 @@ public class ServerInfo : MyCoroutine
{ {
FunctionName = MethodBase.GetCurrentMethod().Name, FunctionName = MethodBase.GetCurrentMethod().Name,
GeneratePlayStreamEvent = true, GeneratePlayStreamEvent = true,
FunctionParameter = new FunctionParameter = MakeFunctionParams(new Dictionary<string, object>
{ {
Token = m_LoginInfo.EntityToken.EntityToken, { "FarmShopID", id },
FarmShopID = id, })
}
}, },
result => result =>
{ {
@ -2715,10 +2676,7 @@ public class ServerInfo : MyCoroutine
{ {
FunctionName = MethodBase.GetCurrentMethod().Name, FunctionName = MethodBase.GetCurrentMethod().Name,
GeneratePlayStreamEvent = true, GeneratePlayStreamEvent = true,
FunctionParameter = new FunctionParameter = MakeFunctionParams()
{
Token = m_LoginInfo.EntityToken.EntityToken,
}
}, },
result => result =>
{ {
@ -2745,11 +2703,10 @@ public class ServerInfo : MyCoroutine
{ {
FunctionName = MethodBase.GetCurrentMethod().Name, FunctionName = MethodBase.GetCurrentMethod().Name,
GeneratePlayStreamEvent = true, GeneratePlayStreamEvent = true,
FunctionParameter = new FunctionParameter = MakeFunctionParams(new Dictionary<string, object>
{ {
Token = m_LoginInfo.EntityToken.EntityToken, { "RemainTime", _remaintime },
RemainTime = _remaintime, })
}
}, },
result => result =>
{ {
@ -2776,10 +2733,7 @@ public class ServerInfo : MyCoroutine
{ {
FunctionName = MethodBase.GetCurrentMethod().Name, FunctionName = MethodBase.GetCurrentMethod().Name,
GeneratePlayStreamEvent = true, GeneratePlayStreamEvent = true,
FunctionParameter = new FunctionParameter = MakeFunctionParams()
{
Token = m_LoginInfo.EntityToken.EntityToken,
}
}, },
result => result =>
{ {

4
Assets/Script/Table/table_chapterquest.cs
View File

@ -71,8 +71,8 @@ public class table_chapterquest : MonoBehaviour
var curChapter = MyValue.MyChoiceMapData.n_MapID; var curChapter = MyValue.MyChoiceMapData.n_MapID;
//return Get_DataList(curChapter)[chap++] as ChapterQuestTableData; // 테스트 : 챕터 퀘스트 //return Get_DataList(curChapter)[chap++] as ChapterQuestTableData; // 테스트 : 챕터 퀘스트
if (sdata.Get_Common(eCommon.GuideStep) <= 2 && sdata.Get_Common(eCommon.GuideCount) < 1) //if (sdata.Get_Common(eCommon.GuideStep) <= 2 && sdata.Get_Common(eCommon.GuideCount) < 1)
return list_Data[0] as ChapterQuestTableData; // return list_Data[0] as ChapterQuestTableData;
//var maxchapter = sdata.Get_Common(eCommon.MaxMapID); //var maxchapter = sdata.Get_Common(eCommon.MaxMapID);
//var maxstage = sdata.Get_Common(eCommon.MaxStage); //var maxstage = sdata.Get_Common(eCommon.MaxStage);

29
Assets/Script/UI/Common/GuideQuestUI.cs
View File

@ -24,7 +24,7 @@ public class GuideQuestUI : MonoBehaviour
public void Set() public void Set()
{ {
var sdata = ServerInfo.Ins.m_ServerData; var sdata = ServerInfo.Ins.m_ServerData;
var step = sdata.Get_Common(eCommon.GuideStep); var step = sdata.GuideQuest.Step;
// 쿠폰 입력이 있을 경우 // 쿠폰 입력이 있을 경우
#if UNITY_ANDROID #if UNITY_ANDROID
@ -110,23 +110,8 @@ public class GuideQuestUI : MonoBehaviour
void Set_Count() void Set_Count()
{ {
var sdata = ServerInfo.Ins.m_ServerData; var sdata = ServerInfo.Ins.m_ServerData;
labels[3].text = $"{sdata.Get_Common(eCommon.GuideCount)}/{Tdata.l_MissionConditionCount}"; labels[3].text = $"{sdata.GuideQuest.Count}/{Tdata.l_MissionConditionCount}";
gos[0].SetActive(sdata.Get_Common(eCommon.GuideCount) >= Tdata.l_MissionConditionCount); gos[0].SetActive(sdata.GuideQuest.Count >= 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);
//});
} }
public void Add_GuideQuest(ePurpose _purpose, int _v) public void Add_GuideQuest(ePurpose _purpose, int _v)
@ -134,7 +119,7 @@ public class GuideQuestUI : MonoBehaviour
if (!DSUtil.CheckNull(Tdata) && Tdata.e_MissionConditionType == _purpose) if (!DSUtil.CheckNull(Tdata) && Tdata.e_MissionConditionType == _purpose)
{ {
var sdata = ServerInfo.Ins.m_ServerData; var sdata = ServerInfo.Ins.m_ServerData;
sdata.Add_Common(eCommon.GuideCount, _v); sdata.GuideQuest.Count += _v;
Set_Count(); Set_Count();
if (!showtoast && gos[0].activeSelf) if (!showtoast && gos[0].activeSelf)
{ {
@ -155,11 +140,11 @@ public class GuideQuestUI : MonoBehaviour
public void OnClick_Reward() public void OnClick_Reward()
{ {
var sdata = ServerInfo.Ins.m_ServerData; var sdata = ServerInfo.Ins.m_ServerData;
if (sdata.Get_Common(eCommon.GuideCount) >= Tdata.l_MissionConditionCount) if (sdata.GuideQuest.Count >= Tdata.l_MissionConditionCount)
{ {
showtoast = false; showtoast = false;
sdata.Set_Common(eCommon.GuideCount, 0); sdata.GuideQuest.Count = 0;
sdata.Add_Common(eCommon.GuideStep); ++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.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(); //GetItemUI.Ins.Show_Items();
Set(); Set();

2
Assets/Script/UI/Shop_old/ShopEventCheck.cs
View File

@ -9,7 +9,7 @@ public class ShopEventCheck : MonoBehaviourSingletonTemplate<ShopEventCheck>
// Start is called before the first frame update // Start is called before the first frame update
void Start() 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); gameObject.SetActive(false);
} }
} }

4
Assets/Script/Util/MyEnum.cs
View File

@ -196,7 +196,9 @@ public enum eStat
public enum eFarmerStat { MoveSpeed, DanceCoolTime } public enum eFarmerStat { MoveSpeed, DanceCoolTime }
public enum eCommon 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, 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, Roullette_Ticket, Roullette_Count, Roullette_ADCount, Roullette_LuckyCount, AttendanceStep, AttendanceDOY,

2
Assets/Script/Util/MyValue.cs
View File

@ -213,7 +213,7 @@ public static class MyValue
//if (ServerInfo.Ins.m_ServerData.Get_Common(eCommon.MaxMapID) >= 10) return true; //if (ServerInfo.Ins.m_ServerData.Get_Common(eCommon.MaxMapID) >= 10) return true;
return false; 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); if (_showToast) ToastUI.Ins.Set(175, someVal);
return false; return false;