From 9d9ffa3309aa7b1a42a8cb6664d8e700f561347f Mon Sep 17 00:00:00 2001 From: Ino Date: Tue, 29 Jul 2025 10:05:42 +0900 Subject: [PATCH] =?UTF-8?q?=EC=B4=88=EA=B8=B0=ED=99=94=20=EC=88=98?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Editor/Resources/.CloudScript.js | 19 +++++++++++++------ Assets/Script/Info/DropItemInfo.cs | 17 +++++++++++++++-- Assets/Script/Server/ServerClass.cs | 1 + Assets/Script/UI/Ingame/MainStatLvUpCard.cs | 3 ++- Assets/Script/Util/DataCheckMgr.cs | 15 +++------------ 5 files changed, 34 insertions(+), 21 deletions(-) diff --git a/Assets/PlayFabEditorExtensions/Editor/Resources/.CloudScript.js b/Assets/PlayFabEditorExtensions/Editor/Resources/.CloudScript.js index 6b5e38d31..e62780bce 100644 --- a/Assets/PlayFabEditorExtensions/Editor/Resources/.CloudScript.js +++ b/Assets/PlayFabEditorExtensions/Editor/Resources/.CloudScript.js @@ -572,14 +572,14 @@ handlers.Save_Init = function(args) if (error < 0) return Get_Return(error); let add_farmshop = null; - let isInit = false; var table = Get_MissionTable(); var itemtable = Get_ItemTable(); var urod = Get_JsonUserData(readonlydata); var dayofyear = Get_DayOfYear(); + let isInitDaily = false; if (urod.Common[3] != dayofyear) { // 일일 초기화 - isInit = true; + isInitDaily = true; urod.Common[3] = dayofyear; add_farmshop = Get_UniqueFarmShopList(Get_FarmShopTable(), 8); @@ -598,30 +598,37 @@ handlers.Save_Init = function(args) Init_Shop(urod, 1); } + let isInitWeek = false; var weekofyear = Get_WeekOfYear(); if (urod.Common[4] != weekofyear) { // 주간 초기화 - isInit = true; + isInitWeek = true; urod.Common[4] = weekofyear; Init_Mission(table, urod, 2); Init_Shop(urod, 2); } + let isInitMonth = false; var curTime = Get_CurKoreaTime(); var month = curTime.getMonth() + 1; if (urod.Common[5] != month) { // 월간 초기화 - isInit = true; + isInitMonth = true; urod.Common[5] = month; Init_Shop(urod, 3); } - if (isInit) + if (isInitDaily || isInitWeek || isInitMonth) { Set_JsonUserData(urod); - return Get_Return(0, { farmshop: add_farmshop ?? [] }); + return Get_Return(0, { + initDaily : isInitDaily, + initWeek : isInitWeek, + initMonth : isInitMonth, + farmshop: add_farmshop ?? [] + }); } return Get_Return(1); } diff --git a/Assets/Script/Info/DropItemInfo.cs b/Assets/Script/Info/DropItemInfo.cs index 604afcd94..2897d780d 100644 --- a/Assets/Script/Info/DropItemInfo.cs +++ b/Assets/Script/Info/DropItemInfo.cs @@ -141,12 +141,19 @@ public class StageDropData { public ObscuredUInt GetExp; Dictionary Item = new Dictionary(); + public ObscuredDouble UseGold; + Dictionary AddMainStat = new Dictionary + { { eMainStatType.STR, 0 }, { eMainStatType.DEX, 0 }, { eMainStatType.INT, 0 } }; public void Init() { - GetExp = 0; - GetExp.RandomizeCryptoKey(); + GetExp = 0; GetExp.RandomizeCryptoKey(); Item.Clear(); + + UseGold = 0; UseGold.RandomizeCryptoKey(); + AddMainStat[eMainStatType.STR] = 0; AddMainStat[eMainStatType.STR].RandomizeCryptoKey(); + AddMainStat[eMainStatType.DEX] = 0; AddMainStat[eMainStatType.DEX].RandomizeCryptoKey(); + AddMainStat[eMainStatType.INT] = 0; AddMainStat[eMainStatType.INT].RandomizeCryptoKey(); } public void Add_Item(int itemid, int count) @@ -156,4 +163,10 @@ public class StageDropData Item[itemid].RandomizeCryptoKey(); } public Dictionary Get_Item() { return Item; } + + public void Add_MainStat(eMainStatType stat, int gold) + { + UseGold += gold; UseGold.RandomizeCryptoKey(); + ++AddMainStat[stat]; AddMainStat[stat].RandomizeCryptoKey(); + } } \ No newline at end of file diff --git a/Assets/Script/Server/ServerClass.cs b/Assets/Script/Server/ServerClass.cs index 808d6316a..36b5830ce 100644 --- a/Assets/Script/Server/ServerClass.cs +++ b/Assets/Script/Server/ServerClass.cs @@ -3003,6 +3003,7 @@ public class SC_GetUserInfoResult public class SC_InitResult { public int error; + public bool initDaily, initWeek, initMonth; public List> farmshop; } public class SC_Items diff --git a/Assets/Script/UI/Ingame/MainStatLvUpCard.cs b/Assets/Script/UI/Ingame/MainStatLvUpCard.cs index 93909ee10..2bd6de16f 100644 --- a/Assets/Script/UI/Ingame/MainStatLvUpCard.cs +++ b/Assets/Script/UI/Ingame/MainStatLvUpCard.cs @@ -76,13 +76,14 @@ public class MainStatLvUpCard : CardBase else { var sdata = ServerInfo.Ins.m_ServerData; - if (sdata.Check_ItemAmount(2, Get_Price())) + if (sdata.Check_ItemAmount(2, price)) { sdata.Use_Item(2, price); sdata.MapData_Add_StatLv(curmap.n_MapID, curmap.n_Difficult, m_Data.mainStatType); Set_UI(); Set_Price(); + DropItemInfo.Ins.m_StageDropData.Add_MainStat(m_Data.mainStatType, price); if (MyInfoUI.isIns) MyInfoUI.Ins.Set_MainStats(); } } diff --git a/Assets/Script/Util/DataCheckMgr.cs b/Assets/Script/Util/DataCheckMgr.cs index 1e9ae5db5..c5bcc69fa 100644 --- a/Assets/Script/Util/DataCheckMgr.cs +++ b/Assets/Script/Util/DataCheckMgr.cs @@ -65,18 +65,9 @@ public class DataCheckMgr : MyCoroutine { checkinit = false; callinit = false; - switch (result.error) - { - case 0: - sdata.Init_Daily(result.farmshop); - break; - case 1: - sdata.Init_Week(SamplesCalendar.Get_WeekOfYear(ServerInfo.ServerTime)); - break; - case 2: - sdata.Init_Month(); - break; - } + if (result.initDaily) sdata.Init_Daily(result.farmshop); + if (result.initWeek) sdata.Init_Week(SamplesCalendar.Get_WeekOfYear(ServerInfo.ServerTime)); + if (result.initMonth) sdata.Init_Month(); }); }