From a1efad92fedb544c8d7bd0a11cf9acd39504cdd2 Mon Sep 17 00:00:00 2001 From: Ino Date: Thu, 24 Jul 2025 15:28:09 +0900 Subject: [PATCH] =?UTF-8?q?=EC=9D=BC=EC=9D=BC,=20=EC=A3=BC=EA=B0=84,=20?= =?UTF-8?q?=EC=9B=94=EA=B0=84=20=EC=B4=88=EA=B8=B0=ED=99=94=20=EC=84=9C?= =?UTF-8?q?=EB=B2=84=EC=97=90=EC=84=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/Editor/GetServerTables.cs | 2 + .../Editor/Resources/.CloudScript.js | 1330 ++++++++++++++++- .../Table/Server/server_ShopItemList.txt | 978 ++++++++++++ .../Table/Server/server_ShopItemList.txt.meta | 7 + Assets/Script/Info/InGameInfo.cs | 1 + Assets/Script/Server/ServerClass.cs | 38 +- Assets/Script/Server/ServerInfo.cs | 29 +- Assets/Script/Util/DataCheckMgr.cs | 35 +- Assets/Script/Util/ErrorLogHookManager.cs | 4 - 9 files changed, 2384 insertions(+), 40 deletions(-) create mode 100644 Assets/ResWork/Table/Server/server_ShopItemList.txt create mode 100644 Assets/ResWork/Table/Server/server_ShopItemList.txt.meta diff --git a/Assets/Editor/GetServerTables.cs b/Assets/Editor/GetServerTables.cs index 116d0d23f..e737329e0 100644 --- a/Assets/Editor/GetServerTables.cs +++ b/Assets/Editor/GetServerTables.cs @@ -1,5 +1,6 @@ using Newtonsoft.Json; using Newtonsoft.Json.Linq; +using System; using System.Collections.Generic; using System.IO; using UnityEditor; @@ -26,6 +27,7 @@ public class GetServerTables Get_ServerTable("WorkerList", new List { "s_Prefab", "f_Scale", "f_UIScale", "f_MoveSpeed", "f_SeekTimeDelay" }); Get_ServerTable("ClassConfig", new List { "s_AnimationController", "s_JobIcon", "s_WeaponLHPrefab", "n_WeaponLHIndex", "s_WeaponRHPrefab", "n_WeaponRHIndex", "e_BattleType", "f_Scale", "f_AttackRange", "f_AttackSPD", "f_MoveSPD", "e_MainStatType", "n_DefaultHP", "n_DefaultMP", "n_ExtraSkill", "n_AcquiredSkill1", "n_AcquiredSkill2", "n_AcquiredSkill3" }); Get_ServerTable("BreakingLimit", new List { "f_Monster_DMG_Multiplier", "f_Boss_DMG_Multiplier", "f_ALL_STAT_Multiplier" }); + Get_ServerTable("ShopItemList", new List { "n_ShopTab", "n_TabName", "exception", "n_ShopSubTab", "n_SubTabName", "s_Banner" }); } static void Get_ServerTable(string path, List except) diff --git a/Assets/PlayFabEditorExtensions/Editor/Resources/.CloudScript.js b/Assets/PlayFabEditorExtensions/Editor/Resources/.CloudScript.js index 0603209cb..43cb44ce6 100644 --- a/Assets/PlayFabEditorExtensions/Editor/Resources/.CloudScript.js +++ b/Assets/PlayFabEditorExtensions/Editor/Resources/.CloudScript.js @@ -468,6 +468,112 @@ handlers.Get_AllMail = function(args) return Get_Return(3); } +handlers.Save_Init = function(args) +{ + var readonlydata = Get_UserReadOnlyData(); + //var error = Get_Error(readonlydata, args.Token); + //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(); + if (urod.Common[3] != dayofyear) + { // 일일 초기화 + isInit = true; + + urod.Common[3] = dayofyear; + add_farmshop = urod.Farm.Shop = Get_UniqueFarmShopList(Get_FarmShopTable(), 8); + Init_DungeonTicket(table, itemtable, urod); + Init_Mission(table, urod, 1); + Init_Shop(urod, 1); + } + + var weekofyear = Get_WeekOfYear(); + if (urod.Common[4] != weekofyear) + { // 주간 초기화 + isInit = true; + + urod.Common[4] = weekofyear; + Init_Mission(table, urod, 2); + Init_Shop(urod, 2); + } + + var curTime = Get_CurKoreaTime(); + var month = curTime.getMonth() + 1; + if (urod.Common[5] != month) + { // 월간 초기화 + isInit = true; + + urod.Common[5] = month; + Init_Shop(urod, 3); + } + + if (isInit) + { + Set_JsonUserData(urod); + return Get_Return(0, { farmshop: add_farmshop ?? [] }); + } + return Get_Return(1); +} +function Get_UniqueFarmShopList(farmtable, ShopCount) +{ + const uniqueShopIDs = new Set(); + + while (uniqueShopIDs.size < ShopCount) { + const randomEntry = farmtable[Math.floor(Math.random() * farmtable.length)]; + uniqueShopIDs.add(randomEntry.n_FarmShopID); + } + + const result = Array.from(uniqueShopIDs).map(id => [id, 0, 0]); + return result; +} +function Init_DungeonTicket(table, itemtable, urod) +{ + for (let i = 0; i < 3; i++) + { + const ticketid = 501 + i; + const amount = Get_ItemAmount(urod, ticketid); + const limit = (ticketid === 501 || ticketid === 503) ? 2 : 3; + + if (amount < limit) + Add_Item(table, itemtable, urod, ticketid, limit - amount); + } +} +function Init_Mission(table, urod, group) +{ + const key1 = group; + if (urod.Mission[key1]) + { + const lst = table.filter(f => f.n_MissionGroupId == group); + for (let i = 0; i < lst.length; i++) + { + const key2 = lst[i].n_MissionIndex; + if (urod.Mission[key1][key2]) + { + urod.Mission[key1][key2][0] = 0; + urod.Mission[key1][key2][1] = 0; + } + } + } +} +function Init_Shop(urod, type) +{ + let lst = []; + if (type === 1) lst = Get_ShopItemTable().filter(f => f.BuyLimit_Day > 0); + else if (type === 2) lst = Get_ShopItemTable().filter(f => f.BuyLimit_Week > 0); + else if (type === 3) lst = Get_ShopItemTable().filter(f => f.BuyLimit_Month > 0); + + for (let i = 0; i < lst.length; i++) + { + const key = lst[i].n_ShopItemID; + if (urod.Shop[key]) + urod.Shop[key][1] = 0; + } +} + handlers.Save_StageResult = function(args) { var readonlydata = Get_UserReadOnlyData(); @@ -22856,8 +22962,1203 @@ function Get_WorkerTable() ] } +function Get_FarmShopTable() +{ + return [ + { + "n_FarmShopID": "1", + "e_ShopType": "AD", + "n_DayLimit": "3", + "n_GapTime": "600", + "n_PayItemID": "0", + "n_PayItemAmount": "0", + "n_ItemID": "1", + "n_ItemAmount": "100" + }, + { + "n_FarmShopID": "2", + "e_ShopType": "Free", + "n_DayLimit": "2", + "n_GapTime": "500", + "n_PayItemID": "0", + "n_PayItemAmount": "0", + "n_ItemID": "2", + "n_ItemAmount": "101" + }, + { + "n_FarmShopID": "3", + "e_ShopType": "Pay", + "n_DayLimit": "1", + "n_GapTime": "0", + "n_PayItemID": "2", + "n_PayItemAmount": "100", + "n_ItemID": "101", + "n_ItemAmount": "102" + }, + { + "n_FarmShopID": "4", + "e_ShopType": "Pay", + "n_DayLimit": "1", + "n_GapTime": "0", + "n_PayItemID": "2", + "n_PayItemAmount": "101", + "n_ItemID": "102", + "n_ItemAmount": "103" + }, + { + "n_FarmShopID": "5", + "e_ShopType": "Pay", + "n_DayLimit": "1", + "n_GapTime": "0", + "n_PayItemID": "2", + "n_PayItemAmount": "102", + "n_ItemID": "103", + "n_ItemAmount": "104" + }, + { + "n_FarmShopID": "6", + "e_ShopType": "Pay", + "n_DayLimit": "2", + "n_GapTime": "0", + "n_PayItemID": "2", + "n_PayItemAmount": "103", + "n_ItemID": "104", + "n_ItemAmount": "105" + }, + { + "n_FarmShopID": "7", + "e_ShopType": "Pay", + "n_DayLimit": "1", + "n_GapTime": "0", + "n_PayItemID": "2", + "n_PayItemAmount": "104", + "n_ItemID": "105", + "n_ItemAmount": "106" + }, + { + "n_FarmShopID": "8", + "e_ShopType": "Pay", + "n_DayLimit": "1", + "n_GapTime": "0", + "n_PayItemID": "2", + "n_PayItemAmount": "105", + "n_ItemID": "106", + "n_ItemAmount": "107" + }, + { + "n_FarmShopID": "9", + "e_ShopType": "Pay", + "n_DayLimit": "1", + "n_GapTime": "0", + "n_PayItemID": "2", + "n_PayItemAmount": "106", + "n_ItemID": "301", + "n_ItemAmount": "108" + }, + { + "n_FarmShopID": "10", + "e_ShopType": "Pay", + "n_DayLimit": "1", + "n_GapTime": "0", + "n_PayItemID": "2", + "n_PayItemAmount": "108", + "n_ItemID": "451", + "n_ItemAmount": "110" + }, + { + "n_FarmShopID": "11", + "e_ShopType": "Pay", + "n_DayLimit": "3", + "n_GapTime": "0", + "n_PayItemID": "2", + "n_PayItemAmount": "109", + "n_ItemID": "452", + "n_ItemAmount": "111" + }, + { + "n_FarmShopID": "12", + "e_ShopType": "Pay", + "n_DayLimit": "1", + "n_GapTime": "0", + "n_PayItemID": "2", + "n_PayItemAmount": "110", + "n_ItemID": "453", + "n_ItemAmount": "112" + }, + { + "n_FarmShopID": "13", + "e_ShopType": "Pay", + "n_DayLimit": "1", + "n_GapTime": "0", + "n_PayItemID": "2", + "n_PayItemAmount": "111", + "n_ItemID": "454", + "n_ItemAmount": "113" + }, + { + "n_FarmShopID": "14", + "e_ShopType": "Pay", + "n_DayLimit": "1", + "n_GapTime": "0", + "n_PayItemID": "2", + "n_PayItemAmount": "112", + "n_ItemID": "455", + "n_ItemAmount": "114" + }, + { + "n_FarmShopID": "15", + "e_ShopType": "Pay", + "n_DayLimit": "2", + "n_GapTime": "0", + "n_PayItemID": "2", + "n_PayItemAmount": "113", + "n_ItemID": "456", + "n_ItemAmount": "115" + }, + { + "n_FarmShopID": "16", + "e_ShopType": "Pay", + "n_DayLimit": "1", + "n_GapTime": "0", + "n_PayItemID": "2", + "n_PayItemAmount": "114", + "n_ItemID": "201", + "n_ItemAmount": "116" + }, + { + "n_FarmShopID": "17", + "e_ShopType": "Pay", + "n_DayLimit": "1", + "n_GapTime": "0", + "n_PayItemID": "2", + "n_PayItemAmount": "115", + "n_ItemID": "202", + "n_ItemAmount": "117" + }, + { + "n_FarmShopID": "18", + "e_ShopType": "Pay", + "n_DayLimit": "2", + "n_GapTime": "0", + "n_PayItemID": "2", + "n_PayItemAmount": "116", + "n_ItemID": "441", + "n_ItemAmount": "118" + }, + { + "n_FarmShopID": "19", + "e_ShopType": "Pay", + "n_DayLimit": "1", + "n_GapTime": "0", + "n_PayItemID": "2", + "n_PayItemAmount": "117", + "n_ItemID": "444", + "n_ItemAmount": "119" + }, + { + "n_FarmShopID": "20", + "e_ShopType": "Pay", + "n_DayLimit": "1", + "n_GapTime": "0", + "n_PayItemID": "2", + "n_PayItemAmount": "118", + "n_ItemID": "445", + "n_ItemAmount": "120" + }, + { + "n_FarmShopID": "21", + "e_ShopType": "Pay", + "n_DayLimit": "1", + "n_GapTime": "0", + "n_PayItemID": "2", + "n_PayItemAmount": "119", + "n_ItemID": "450", + "n_ItemAmount": "121" + } + ] +} - +function Get_ShopItemTable() +{ + return [ + { + "n_ShopItemID": "7001", + "s_InappID": "", + "n_RandomBagID": "7001", + "n_FirstBonus": "0", + "n_Mileage": "0", + "b_Package": "True", + "n_PriceItemID": "-1", + "n_Price": "0", + "e_BuyCondition": "None", + "BuyLimit": "0", + "BuyLimit_Day": "3", + "BuyLimit_Week": "0", + "BuyLimit_Month": "0", + "n_ADGapTime": "100" + }, + { + "n_ShopItemID": "7002", + "s_InappID": "", + "n_RandomBagID": "7002", + "n_FirstBonus": "0", + "n_Mileage": "0", + "b_Package": "True", + "n_PriceItemID": "-1", + "n_Price": "0", + "e_BuyCondition": "None", + "BuyLimit": "0", + "BuyLimit_Day": "2", + "BuyLimit_Week": "0", + "BuyLimit_Month": "0", + "n_ADGapTime": "200" + }, + { + "n_ShopItemID": "7011", + "s_InappID": "", + "n_RandomBagID": "7011", + "n_FirstBonus": "0", + "n_Mileage": "55", + "b_Package": "True", + "n_PriceItemID": "3", + "n_Price": "1000", + "e_BuyCondition": "None", + "BuyLimit": "1", + "BuyLimit_Day": "0", + "BuyLimit_Week": "0", + "BuyLimit_Month": "0", + "n_ADGapTime": "0" + }, + { + "n_ShopItemID": "7012", + "s_InappID": "", + "n_RandomBagID": "7012", + "n_FirstBonus": "0", + "n_Mileage": "55", + "b_Package": "True", + "n_PriceItemID": "3", + "n_Price": "1100", + "e_BuyCondition": "None", + "BuyLimit": "1", + "BuyLimit_Day": "0", + "BuyLimit_Week": "0", + "BuyLimit_Month": "0", + "n_ADGapTime": "0" + }, + { + "n_ShopItemID": "7013", + "s_InappID": "", + "n_RandomBagID": "7013", + "n_FirstBonus": "0", + "n_Mileage": "55", + "b_Package": "True", + "n_PriceItemID": "3", + "n_Price": "1200", + "e_BuyCondition": "None", + "BuyLimit": "1", + "BuyLimit_Day": "0", + "BuyLimit_Week": "0", + "BuyLimit_Month": "0", + "n_ADGapTime": "0" + }, + { + "n_ShopItemID": "7014", + "s_InappID": "", + "n_RandomBagID": "7014", + "n_FirstBonus": "0", + "n_Mileage": "55", + "b_Package": "True", + "n_PriceItemID": "3", + "n_Price": "1300", + "e_BuyCondition": "None", + "BuyLimit": "1", + "BuyLimit_Day": "0", + "BuyLimit_Week": "0", + "BuyLimit_Month": "0", + "n_ADGapTime": "0" + }, + { + "n_ShopItemID": "7015", + "s_InappID": "", + "n_RandomBagID": "7015", + "n_FirstBonus": "0", + "n_Mileage": "110", + "b_Package": "True", + "n_PriceItemID": "3", + "n_Price": "1400", + "e_BuyCondition": "None", + "BuyLimit": "0", + "BuyLimit_Day": "1", + "BuyLimit_Week": "0", + "BuyLimit_Month": "0", + "n_ADGapTime": "0" + }, + { + "n_ShopItemID": "7016", + "s_InappID": "", + "n_RandomBagID": "7016", + "n_FirstBonus": "0", + "n_Mileage": "110", + "b_Package": "True", + "n_PriceItemID": "3", + "n_Price": "1500", + "e_BuyCondition": "None", + "BuyLimit": "0", + "BuyLimit_Day": "2", + "BuyLimit_Week": "0", + "BuyLimit_Month": "0", + "n_ADGapTime": "0" + }, + { + "n_ShopItemID": "7017", + "s_InappID": "", + "n_RandomBagID": "7017", + "n_FirstBonus": "0", + "n_Mileage": "110", + "b_Package": "True", + "n_PriceItemID": "3", + "n_Price": "1600", + "e_BuyCondition": "None", + "BuyLimit": "0", + "BuyLimit_Day": "0", + "BuyLimit_Week": "1", + "BuyLimit_Month": "0", + "n_ADGapTime": "0" + }, + { + "n_ShopItemID": "7018", + "s_InappID": "", + "n_RandomBagID": "7018", + "n_FirstBonus": "0", + "n_Mileage": "110", + "b_Package": "True", + "n_PriceItemID": "3", + "n_Price": "1700", + "e_BuyCondition": "None", + "BuyLimit": "0", + "BuyLimit_Day": "0", + "BuyLimit_Week": "2", + "BuyLimit_Month": "1", + "n_ADGapTime": "0" + }, + { + "n_ShopItemID": "7019", + "s_InappID": "", + "n_RandomBagID": "7019", + "n_FirstBonus": "0", + "n_Mileage": "110", + "b_Package": "True", + "n_PriceItemID": "3", + "n_Price": "1800", + "e_BuyCondition": "None", + "BuyLimit": "0", + "BuyLimit_Day": "0", + "BuyLimit_Week": "0", + "BuyLimit_Month": "2", + "n_ADGapTime": "0" + }, + { + "n_ShopItemID": "7020", + "s_InappID": "", + "n_RandomBagID": "7020", + "n_FirstBonus": "0", + "n_Mileage": "110", + "b_Package": "True", + "n_PriceItemID": "3", + "n_Price": "1900", + "e_BuyCondition": "None", + "BuyLimit": "0", + "BuyLimit_Day": "0", + "BuyLimit_Week": "0", + "BuyLimit_Month": "3", + "n_ADGapTime": "0" + }, + { + "n_ShopItemID": "7101", + "s_InappID": "", + "n_RandomBagID": "7101", + "n_FirstBonus": "0", + "n_Mileage": "55", + "b_Package": "False", + "n_PriceItemID": "3", + "n_Price": "5500", + "e_BuyCondition": "None", + "BuyLimit": "1", + "BuyLimit_Day": "0", + "BuyLimit_Week": "0", + "BuyLimit_Month": "0", + "n_ADGapTime": "0" + }, + { + "n_ShopItemID": "7102", + "s_InappID": "", + "n_RandomBagID": "7102", + "n_FirstBonus": "0", + "n_Mileage": "110", + "b_Package": "False", + "n_PriceItemID": "3", + "n_Price": "11000", + "e_BuyCondition": "None", + "BuyLimit": "1", + "BuyLimit_Day": "0", + "BuyLimit_Week": "0", + "BuyLimit_Month": "0", + "n_ADGapTime": "0" + }, + { + "n_ShopItemID": "7103", + "s_InappID": "", + "n_RandomBagID": "7103", + "n_FirstBonus": "0", + "n_Mileage": "220", + "b_Package": "False", + "n_PriceItemID": "3", + "n_Price": "22000", + "e_BuyCondition": "None", + "BuyLimit": "1", + "BuyLimit_Day": "0", + "BuyLimit_Week": "0", + "BuyLimit_Month": "0", + "n_ADGapTime": "0" + }, + { + "n_ShopItemID": "7104", + "s_InappID": "", + "n_RandomBagID": "7104", + "n_FirstBonus": "0", + "n_Mileage": "110", + "b_Package": "False", + "n_PriceItemID": "3", + "n_Price": "11000", + "e_BuyCondition": "None", + "BuyLimit": "1", + "BuyLimit_Day": "0", + "BuyLimit_Week": "0", + "BuyLimit_Month": "0", + "n_ADGapTime": "0" + }, + { + "n_ShopItemID": "7105", + "s_InappID": "", + "n_RandomBagID": "7105", + "n_FirstBonus": "0", + "n_Mileage": "220", + "b_Package": "False", + "n_PriceItemID": "3", + "n_Price": "22000", + "e_BuyCondition": "None", + "BuyLimit": "1", + "BuyLimit_Day": "0", + "BuyLimit_Week": "0", + "BuyLimit_Month": "0", + "n_ADGapTime": "0" + }, + { + "n_ShopItemID": "7106", + "s_InappID": "", + "n_RandomBagID": "7106", + "n_FirstBonus": "0", + "n_Mileage": "55", + "b_Package": "False", + "n_PriceItemID": "3", + "n_Price": "5500", + "e_BuyCondition": "None", + "BuyLimit": "1", + "BuyLimit_Day": "0", + "BuyLimit_Week": "0", + "BuyLimit_Month": "0", + "n_ADGapTime": "0" + }, + { + "n_ShopItemID": "7107", + "s_InappID": "", + "n_RandomBagID": "7107", + "n_FirstBonus": "0", + "n_Mileage": "110", + "b_Package": "False", + "n_PriceItemID": "3", + "n_Price": "11000", + "e_BuyCondition": "None", + "BuyLimit": "1", + "BuyLimit_Day": "0", + "BuyLimit_Week": "0", + "BuyLimit_Month": "0", + "n_ADGapTime": "0" + }, + { + "n_ShopItemID": "7108", + "s_InappID": "", + "n_RandomBagID": "7108", + "n_FirstBonus": "0", + "n_Mileage": "220", + "b_Package": "False", + "n_PriceItemID": "3", + "n_Price": "22000", + "e_BuyCondition": "None", + "BuyLimit": "1", + "BuyLimit_Day": "0", + "BuyLimit_Week": "0", + "BuyLimit_Month": "0", + "n_ADGapTime": "0" + }, + { + "n_ShopItemID": "7109", + "s_InappID": "", + "n_RandomBagID": "7109", + "n_FirstBonus": "0", + "n_Mileage": "330", + "b_Package": "False", + "n_PriceItemID": "3", + "n_Price": "33000", + "e_BuyCondition": "None", + "BuyLimit": "1", + "BuyLimit_Day": "0", + "BuyLimit_Week": "0", + "BuyLimit_Month": "0", + "n_ADGapTime": "0" + }, + { + "n_ShopItemID": "7110", + "s_InappID": "", + "n_RandomBagID": "7110", + "n_FirstBonus": "0", + "n_Mileage": "990", + "b_Package": "False", + "n_PriceItemID": "3", + "n_Price": "99000", + "e_BuyCondition": "None", + "BuyLimit": "1", + "BuyLimit_Day": "0", + "BuyLimit_Week": "0", + "BuyLimit_Month": "0", + "n_ADGapTime": "0" + }, + { + "n_ShopItemID": "7201", + "s_InappID": "", + "n_RandomBagID": "7201", + "n_FirstBonus": "0", + "n_Mileage": "0", + "b_Package": "True", + "n_PriceItemID": "-1", + "n_Price": "0", + "e_BuyCondition": "None", + "BuyLimit": "0", + "BuyLimit_Day": "0", + "BuyLimit_Week": "15", + "BuyLimit_Month": "0", + "n_ADGapTime": "600" + }, + { + "n_ShopItemID": "7211", + "s_InappID": "", + "n_RandomBagID": "7211", + "n_FirstBonus": "0", + "n_Mileage": "0", + "b_Package": "False", + "n_PriceItemID": "1", + "n_Price": "10", + "e_BuyCondition": "None", + "BuyLimit": "0", + "BuyLimit_Day": "5", + "BuyLimit_Week": "0", + "BuyLimit_Month": "0", + "n_ADGapTime": "0" + }, + { + "n_ShopItemID": "7212", + "s_InappID": "", + "n_RandomBagID": "7212", + "n_FirstBonus": "0", + "n_Mileage": "0", + "b_Package": "False", + "n_PriceItemID": "1", + "n_Price": "11", + "e_BuyCondition": "None", + "BuyLimit": "0", + "BuyLimit_Day": "5", + "BuyLimit_Week": "0", + "BuyLimit_Month": "0", + "n_ADGapTime": "0" + }, + { + "n_ShopItemID": "7213", + "s_InappID": "", + "n_RandomBagID": "7213", + "n_FirstBonus": "0", + "n_Mileage": "0", + "b_Package": "False", + "n_PriceItemID": "1", + "n_Price": "12", + "e_BuyCondition": "None", + "BuyLimit": "0", + "BuyLimit_Day": "5", + "BuyLimit_Week": "0", + "BuyLimit_Month": "0", + "n_ADGapTime": "0" + }, + { + "n_ShopItemID": "7214", + "s_InappID": "", + "n_RandomBagID": "7214", + "n_FirstBonus": "0", + "n_Mileage": "0", + "b_Package": "False", + "n_PriceItemID": "1", + "n_Price": "13", + "e_BuyCondition": "None", + "BuyLimit": "0", + "BuyLimit_Day": "5", + "BuyLimit_Week": "0", + "BuyLimit_Month": "0", + "n_ADGapTime": "0" + }, + { + "n_ShopItemID": "7215", + "s_InappID": "", + "n_RandomBagID": "7215", + "n_FirstBonus": "0", + "n_Mileage": "0", + "b_Package": "False", + "n_PriceItemID": "1", + "n_Price": "14", + "e_BuyCondition": "None", + "BuyLimit": "0", + "BuyLimit_Day": "5", + "BuyLimit_Week": "0", + "BuyLimit_Month": "0", + "n_ADGapTime": "0" + }, + { + "n_ShopItemID": "7216", + "s_InappID": "", + "n_RandomBagID": "7216", + "n_FirstBonus": "0", + "n_Mileage": "0", + "b_Package": "False", + "n_PriceItemID": "1", + "n_Price": "15", + "e_BuyCondition": "None", + "BuyLimit": "0", + "BuyLimit_Day": "5", + "BuyLimit_Week": "0", + "BuyLimit_Month": "0", + "n_ADGapTime": "0" + }, + { + "n_ShopItemID": "7217", + "s_InappID": "", + "n_RandomBagID": "7217", + "n_FirstBonus": "0", + "n_Mileage": "0", + "b_Package": "False", + "n_PriceItemID": "1", + "n_Price": "16", + "e_BuyCondition": "None", + "BuyLimit": "0", + "BuyLimit_Day": "5", + "BuyLimit_Week": "0", + "BuyLimit_Month": "0", + "n_ADGapTime": "0" + }, + { + "n_ShopItemID": "7218", + "s_InappID": "", + "n_RandomBagID": "7218", + "n_FirstBonus": "0", + "n_Mileage": "0", + "b_Package": "False", + "n_PriceItemID": "1", + "n_Price": "17", + "e_BuyCondition": "None", + "BuyLimit": "0", + "BuyLimit_Day": "5", + "BuyLimit_Week": "0", + "BuyLimit_Month": "0", + "n_ADGapTime": "0" + }, + { + "n_ShopItemID": "7219", + "s_InappID": "", + "n_RandomBagID": "7219", + "n_FirstBonus": "0", + "n_Mileage": "0", + "b_Package": "False", + "n_PriceItemID": "1", + "n_Price": "18", + "e_BuyCondition": "None", + "BuyLimit": "0", + "BuyLimit_Day": "5", + "BuyLimit_Week": "0", + "BuyLimit_Month": "0", + "n_ADGapTime": "0" + }, + { + "n_ShopItemID": "7220", + "s_InappID": "", + "n_RandomBagID": "7220", + "n_FirstBonus": "0", + "n_Mileage": "0", + "b_Package": "False", + "n_PriceItemID": "1", + "n_Price": "19", + "e_BuyCondition": "None", + "BuyLimit": "0", + "BuyLimit_Day": "5", + "BuyLimit_Week": "0", + "BuyLimit_Month": "0", + "n_ADGapTime": "0" + }, + { + "n_ShopItemID": "7221", + "s_InappID": "", + "n_RandomBagID": "7221", + "n_FirstBonus": "0", + "n_Mileage": "0", + "b_Package": "False", + "n_PriceItemID": "1", + "n_Price": "20", + "e_BuyCondition": "None", + "BuyLimit": "0", + "BuyLimit_Day": "5", + "BuyLimit_Week": "0", + "BuyLimit_Month": "0", + "n_ADGapTime": "0" + }, + { + "n_ShopItemID": "7222", + "s_InappID": "", + "n_RandomBagID": "7222", + "n_FirstBonus": "0", + "n_Mileage": "0", + "b_Package": "False", + "n_PriceItemID": "1", + "n_Price": "21", + "e_BuyCondition": "None", + "BuyLimit": "0", + "BuyLimit_Day": "5", + "BuyLimit_Week": "0", + "BuyLimit_Month": "0", + "n_ADGapTime": "0" + }, + { + "n_ShopItemID": "7223", + "s_InappID": "", + "n_RandomBagID": "7223", + "n_FirstBonus": "0", + "n_Mileage": "0", + "b_Package": "False", + "n_PriceItemID": "1", + "n_Price": "22", + "e_BuyCondition": "None", + "BuyLimit": "0", + "BuyLimit_Day": "5", + "BuyLimit_Week": "0", + "BuyLimit_Month": "0", + "n_ADGapTime": "0" + }, + { + "n_ShopItemID": "7224", + "s_InappID": "", + "n_RandomBagID": "7224", + "n_FirstBonus": "0", + "n_Mileage": "0", + "b_Package": "False", + "n_PriceItemID": "1", + "n_Price": "23", + "e_BuyCondition": "None", + "BuyLimit": "0", + "BuyLimit_Day": "5", + "BuyLimit_Week": "0", + "BuyLimit_Month": "0", + "n_ADGapTime": "0" + }, + { + "n_ShopItemID": "7301", + "s_InappID": "", + "n_RandomBagID": "7301", + "n_FirstBonus": "0", + "n_Mileage": "0", + "b_Package": "False", + "n_PriceItemID": "-1", + "n_Price": "0", + "e_BuyCondition": "None", + "BuyLimit": "0", + "BuyLimit_Day": "5", + "BuyLimit_Week": "0", + "BuyLimit_Month": "0", + "n_ADGapTime": "600" + }, + { + "n_ShopItemID": "7311", + "s_InappID": "com.nerdnavis.cash1", + "n_RandomBagID": "7311", + "n_FirstBonus": "100", + "n_Mileage": "55", + "b_Package": "False", + "n_PriceItemID": "-2", + "n_Price": "5500", + "e_BuyCondition": "None", + "BuyLimit": "0", + "BuyLimit_Day": "0", + "BuyLimit_Week": "0", + "BuyLimit_Month": "0", + "n_ADGapTime": "0" + }, + { + "n_ShopItemID": "7312", + "s_InappID": "com.nerdnavis.cash2", + "n_RandomBagID": "7312", + "n_FirstBonus": "300", + "n_Mileage": "110", + "b_Package": "False", + "n_PriceItemID": "-2", + "n_Price": "11000", + "e_BuyCondition": "None", + "BuyLimit": "0", + "BuyLimit_Day": "0", + "BuyLimit_Week": "0", + "BuyLimit_Month": "0", + "n_ADGapTime": "0" + }, + { + "n_ShopItemID": "7313", + "s_InappID": "com.nerdnavis.cash3", + "n_RandomBagID": "7313", + "n_FirstBonus": "500", + "n_Mileage": "220", + "b_Package": "False", + "n_PriceItemID": "-2", + "n_Price": "22000", + "e_BuyCondition": "None", + "BuyLimit": "0", + "BuyLimit_Day": "0", + "BuyLimit_Week": "0", + "BuyLimit_Month": "0", + "n_ADGapTime": "0" + }, + { + "n_ShopItemID": "7314", + "s_InappID": "com.nerdnavis.cash4", + "n_RandomBagID": "7314", + "n_FirstBonus": "1000", + "n_Mileage": "550", + "b_Package": "False", + "n_PriceItemID": "-2", + "n_Price": "55000", + "e_BuyCondition": "None", + "BuyLimit": "0", + "BuyLimit_Day": "0", + "BuyLimit_Week": "0", + "BuyLimit_Month": "0", + "n_ADGapTime": "0" + }, + { + "n_ShopItemID": "7315", + "s_InappID": "com.nerdnavis.cash5", + "n_RandomBagID": "7315", + "n_FirstBonus": "3000", + "n_Mileage": "1100", + "b_Package": "False", + "n_PriceItemID": "-2", + "n_Price": "110000", + "e_BuyCondition": "None", + "BuyLimit": "0", + "BuyLimit_Day": "0", + "BuyLimit_Week": "0", + "BuyLimit_Month": "0", + "n_ADGapTime": "0" + }, + { + "n_ShopItemID": "7321", + "s_InappID": "", + "n_RandomBagID": "7321", + "n_FirstBonus": "0", + "n_Mileage": "0", + "b_Package": "False", + "n_PriceItemID": "-1", + "n_Price": "0", + "e_BuyCondition": "None", + "BuyLimit": "0", + "BuyLimit_Day": "5", + "BuyLimit_Week": "0", + "BuyLimit_Month": "0", + "n_ADGapTime": "600" + }, + { + "n_ShopItemID": "7331", + "s_InappID": "", + "n_RandomBagID": "7331", + "n_FirstBonus": "0", + "n_Mileage": "0", + "b_Package": "False", + "n_PriceItemID": "1", + "n_Price": "250", + "e_BuyCondition": "None", + "BuyLimit": "0", + "BuyLimit_Day": "0", + "BuyLimit_Week": "0", + "BuyLimit_Month": "0", + "n_ADGapTime": "0" + }, + { + "n_ShopItemID": "7332", + "s_InappID": "", + "n_RandomBagID": "7332", + "n_FirstBonus": "0", + "n_Mileage": "0", + "b_Package": "False", + "n_PriceItemID": "1", + "n_Price": "500", + "e_BuyCondition": "None", + "BuyLimit": "0", + "BuyLimit_Day": "0", + "BuyLimit_Week": "0", + "BuyLimit_Month": "0", + "n_ADGapTime": "0" + }, + { + "n_ShopItemID": "7333", + "s_InappID": "", + "n_RandomBagID": "7333", + "n_FirstBonus": "0", + "n_Mileage": "0", + "b_Package": "False", + "n_PriceItemID": "1", + "n_Price": "1000", + "e_BuyCondition": "None", + "BuyLimit": "0", + "BuyLimit_Day": "0", + "BuyLimit_Week": "0", + "BuyLimit_Month": "0", + "n_ADGapTime": "0" + }, + { + "n_ShopItemID": "7401", + "s_InappID": "", + "n_RandomBagID": "7401", + "n_FirstBonus": "0", + "n_Mileage": "0", + "b_Package": "False", + "n_PriceItemID": "4", + "n_Price": "5", + "e_BuyCondition": "None", + "BuyLimit": "0", + "BuyLimit_Day": "3", + "BuyLimit_Week": "0", + "BuyLimit_Month": "0", + "n_ADGapTime": "0" + }, + { + "n_ShopItemID": "7402", + "s_InappID": "", + "n_RandomBagID": "7402", + "n_FirstBonus": "0", + "n_Mileage": "0", + "b_Package": "False", + "n_PriceItemID": "4", + "n_Price": "6", + "e_BuyCondition": "None", + "BuyLimit": "0", + "BuyLimit_Day": "3", + "BuyLimit_Week": "0", + "BuyLimit_Month": "0", + "n_ADGapTime": "0" + }, + { + "n_ShopItemID": "7403", + "s_InappID": "", + "n_RandomBagID": "7403", + "n_FirstBonus": "0", + "n_Mileage": "0", + "b_Package": "False", + "n_PriceItemID": "4", + "n_Price": "7", + "e_BuyCondition": "None", + "BuyLimit": "0", + "BuyLimit_Day": "3", + "BuyLimit_Week": "0", + "BuyLimit_Month": "0", + "n_ADGapTime": "0" + }, + { + "n_ShopItemID": "7404", + "s_InappID": "", + "n_RandomBagID": "7404", + "n_FirstBonus": "0", + "n_Mileage": "0", + "b_Package": "False", + "n_PriceItemID": "4", + "n_Price": "8", + "e_BuyCondition": "None", + "BuyLimit": "0", + "BuyLimit_Day": "3", + "BuyLimit_Week": "0", + "BuyLimit_Month": "0", + "n_ADGapTime": "0" + }, + { + "n_ShopItemID": "7405", + "s_InappID": "", + "n_RandomBagID": "7405", + "n_FirstBonus": "0", + "n_Mileage": "0", + "b_Package": "False", + "n_PriceItemID": "4", + "n_Price": "9", + "e_BuyCondition": "None", + "BuyLimit": "0", + "BuyLimit_Day": "3", + "BuyLimit_Week": "0", + "BuyLimit_Month": "0", + "n_ADGapTime": "0" + }, + { + "n_ShopItemID": "7406", + "s_InappID": "", + "n_RandomBagID": "7406", + "n_FirstBonus": "0", + "n_Mileage": "0", + "b_Package": "False", + "n_PriceItemID": "4", + "n_Price": "10", + "e_BuyCondition": "None", + "BuyLimit": "0", + "BuyLimit_Day": "3", + "BuyLimit_Week": "0", + "BuyLimit_Month": "0", + "n_ADGapTime": "0" + }, + { + "n_ShopItemID": "7407", + "s_InappID": "", + "n_RandomBagID": "7407", + "n_FirstBonus": "0", + "n_Mileage": "0", + "b_Package": "False", + "n_PriceItemID": "4", + "n_Price": "11", + "e_BuyCondition": "None", + "BuyLimit": "0", + "BuyLimit_Day": "3", + "BuyLimit_Week": "0", + "BuyLimit_Month": "0", + "n_ADGapTime": "0" + }, + { + "n_ShopItemID": "7408", + "s_InappID": "", + "n_RandomBagID": "7408", + "n_FirstBonus": "0", + "n_Mileage": "0", + "b_Package": "False", + "n_PriceItemID": "4", + "n_Price": "12", + "e_BuyCondition": "None", + "BuyLimit": "0", + "BuyLimit_Day": "10", + "BuyLimit_Week": "0", + "BuyLimit_Month": "0", + "n_ADGapTime": "0" + }, + { + "n_ShopItemID": "7409", + "s_InappID": "", + "n_RandomBagID": "7409", + "n_FirstBonus": "0", + "n_Mileage": "0", + "b_Package": "False", + "n_PriceItemID": "4", + "n_Price": "13", + "e_BuyCondition": "None", + "BuyLimit": "0", + "BuyLimit_Day": "10", + "BuyLimit_Week": "0", + "BuyLimit_Month": "0", + "n_ADGapTime": "0" + }, + { + "n_ShopItemID": "7410", + "s_InappID": "", + "n_RandomBagID": "7410", + "n_FirstBonus": "0", + "n_Mileage": "0", + "b_Package": "False", + "n_PriceItemID": "4", + "n_Price": "14", + "e_BuyCondition": "None", + "BuyLimit": "0", + "BuyLimit_Day": "5", + "BuyLimit_Week": "0", + "BuyLimit_Month": "0", + "n_ADGapTime": "0" + }, + { + "n_ShopItemID": "7411", + "s_InappID": "", + "n_RandomBagID": "7411", + "n_FirstBonus": "0", + "n_Mileage": "0", + "b_Package": "False", + "n_PriceItemID": "4", + "n_Price": "15", + "e_BuyCondition": "None", + "BuyLimit": "0", + "BuyLimit_Day": "5", + "BuyLimit_Week": "0", + "BuyLimit_Month": "0", + "n_ADGapTime": "0" + }, + { + "n_ShopItemID": "7412", + "s_InappID": "", + "n_RandomBagID": "7412", + "n_FirstBonus": "0", + "n_Mileage": "0", + "b_Package": "False", + "n_PriceItemID": "4", + "n_Price": "16", + "e_BuyCondition": "None", + "BuyLimit": "0", + "BuyLimit_Day": "5", + "BuyLimit_Week": "0", + "BuyLimit_Month": "0", + "n_ADGapTime": "0" + }, + { + "n_ShopItemID": "7413", + "s_InappID": "", + "n_RandomBagID": "7413", + "n_FirstBonus": "0", + "n_Mileage": "0", + "b_Package": "False", + "n_PriceItemID": "4", + "n_Price": "17", + "e_BuyCondition": "None", + "BuyLimit": "0", + "BuyLimit_Day": "5", + "BuyLimit_Week": "0", + "BuyLimit_Month": "0", + "n_ADGapTime": "0" + }, + { + "n_ShopItemID": "7414", + "s_InappID": "", + "n_RandomBagID": "7414", + "n_FirstBonus": "0", + "n_Mileage": "0", + "b_Package": "False", + "n_PriceItemID": "4", + "n_Price": "18", + "e_BuyCondition": "None", + "BuyLimit": "0", + "BuyLimit_Day": "5", + "BuyLimit_Week": "0", + "BuyLimit_Month": "0", + "n_ADGapTime": "0" + } + ] +} @@ -22933,6 +24234,33 @@ function Get_CurKoreaTime() var curServerTime = new Date(); return new Date(curServerTime.setHours(curServerTime.getHours() + 9)); } +function Get_DayOfYear() +{ + var date = Get_CurKoreaTime(); + const start = new Date(date.getFullYear(), 0, 0); + const diff = date - start; + const oneDay = 1000 * 60 * 60 * 24; + return Math.floor(diff / oneDay); +} +function Get_WeekOfYear() +{ + const now = Get_CurKoreaTime(); + + const firstDayOfYear = new Date(now.getFullYear(), 0, 1); + + // 첫 번째 주 시작일을 "월요일 기준"으로 정렬 + const day = firstDayOfYear.getDay(); // 0 (일) ~ 6 (토) + const dayOffset = (day === 0 ? -6 : 1) - day; // 월요일까지 이동 (일요일인 경우 -6) + const firstWeekStart = new Date(firstDayOfYear); + firstWeekStart.setDate(firstDayOfYear.getDate() + dayOffset); + + // 현재 날짜와 첫 주 시작일 사이의 차이 (밀리초 → 주 단위) + const diffInMs = now - firstWeekStart; + const weekNumber = Math.floor(diffInMs / (7 * 24 * 60 * 60 * 1000)) + 1; + + // 0주차가 나오는 경우 → 작년 마지막 주로 간주할 수도 있음 + return weekNumber < 1 ? 1 : weekNumber; +} function CheckNullOrEmpty(value) { if (value == "" || value == null || value == undefined || (value != null && typeof value == "object" && !Object.keys(value).length)) diff --git a/Assets/ResWork/Table/Server/server_ShopItemList.txt b/Assets/ResWork/Table/Server/server_ShopItemList.txt new file mode 100644 index 000000000..2b35a9dce --- /dev/null +++ b/Assets/ResWork/Table/Server/server_ShopItemList.txt @@ -0,0 +1,978 @@ +[ + { + "n_ShopItemID": "7001", + "s_InappID": "", + "n_RandomBagID": "7001", + "n_FirstBonus": "0", + "n_Mileage": "0", + "b_Package": "True", + "n_PriceItemID": "-1", + "n_Price": "0", + "e_BuyCondition": "None", + "BuyLimit": "0", + "BuyLimit_Day": "3", + "BuyLimit_Week": "0", + "BuyLimit_Month": "0", + "n_ADGapTime": "100" + }, + { + "n_ShopItemID": "7002", + "s_InappID": "", + "n_RandomBagID": "7002", + "n_FirstBonus": "0", + "n_Mileage": "0", + "b_Package": "True", + "n_PriceItemID": "-1", + "n_Price": "0", + "e_BuyCondition": "None", + "BuyLimit": "0", + "BuyLimit_Day": "2", + "BuyLimit_Week": "0", + "BuyLimit_Month": "0", + "n_ADGapTime": "200" + }, + { + "n_ShopItemID": "7011", + "s_InappID": "", + "n_RandomBagID": "7011", + "n_FirstBonus": "0", + "n_Mileage": "55", + "b_Package": "True", + "n_PriceItemID": "3", + "n_Price": "1000", + "e_BuyCondition": "None", + "BuyLimit": "1", + "BuyLimit_Day": "0", + "BuyLimit_Week": "0", + "BuyLimit_Month": "0", + "n_ADGapTime": "0" + }, + { + "n_ShopItemID": "7012", + "s_InappID": "", + "n_RandomBagID": "7012", + "n_FirstBonus": "0", + "n_Mileage": "55", + "b_Package": "True", + "n_PriceItemID": "3", + "n_Price": "1100", + "e_BuyCondition": "None", + "BuyLimit": "1", + "BuyLimit_Day": "0", + "BuyLimit_Week": "0", + "BuyLimit_Month": "0", + "n_ADGapTime": "0" + }, + { + "n_ShopItemID": "7013", + "s_InappID": "", + "n_RandomBagID": "7013", + "n_FirstBonus": "0", + "n_Mileage": "55", + "b_Package": "True", + "n_PriceItemID": "3", + "n_Price": "1200", + "e_BuyCondition": "None", + "BuyLimit": "1", + "BuyLimit_Day": "0", + "BuyLimit_Week": "0", + "BuyLimit_Month": "0", + "n_ADGapTime": "0" + }, + { + "n_ShopItemID": "7014", + "s_InappID": "", + "n_RandomBagID": "7014", + "n_FirstBonus": "0", + "n_Mileage": "55", + "b_Package": "True", + "n_PriceItemID": "3", + "n_Price": "1300", + "e_BuyCondition": "None", + "BuyLimit": "1", + "BuyLimit_Day": "0", + "BuyLimit_Week": "0", + "BuyLimit_Month": "0", + "n_ADGapTime": "0" + }, + { + "n_ShopItemID": "7015", + "s_InappID": "", + "n_RandomBagID": "7015", + "n_FirstBonus": "0", + "n_Mileage": "110", + "b_Package": "True", + "n_PriceItemID": "3", + "n_Price": "1400", + "e_BuyCondition": "None", + "BuyLimit": "0", + "BuyLimit_Day": "1", + "BuyLimit_Week": "0", + "BuyLimit_Month": "0", + "n_ADGapTime": "0" + }, + { + "n_ShopItemID": "7016", + "s_InappID": "", + "n_RandomBagID": "7016", + "n_FirstBonus": "0", + "n_Mileage": "110", + "b_Package": "True", + "n_PriceItemID": "3", + "n_Price": "1500", + "e_BuyCondition": "None", + "BuyLimit": "0", + "BuyLimit_Day": "2", + "BuyLimit_Week": "0", + "BuyLimit_Month": "0", + "n_ADGapTime": "0" + }, + { + "n_ShopItemID": "7017", + "s_InappID": "", + "n_RandomBagID": "7017", + "n_FirstBonus": "0", + "n_Mileage": "110", + "b_Package": "True", + "n_PriceItemID": "3", + "n_Price": "1600", + "e_BuyCondition": "None", + "BuyLimit": "0", + "BuyLimit_Day": "0", + "BuyLimit_Week": "1", + "BuyLimit_Month": "0", + "n_ADGapTime": "0" + }, + { + "n_ShopItemID": "7018", + "s_InappID": "", + "n_RandomBagID": "7018", + "n_FirstBonus": "0", + "n_Mileage": "110", + "b_Package": "True", + "n_PriceItemID": "3", + "n_Price": "1700", + "e_BuyCondition": "None", + "BuyLimit": "0", + "BuyLimit_Day": "0", + "BuyLimit_Week": "2", + "BuyLimit_Month": "1", + "n_ADGapTime": "0" + }, + { + "n_ShopItemID": "7019", + "s_InappID": "", + "n_RandomBagID": "7019", + "n_FirstBonus": "0", + "n_Mileage": "110", + "b_Package": "True", + "n_PriceItemID": "3", + "n_Price": "1800", + "e_BuyCondition": "None", + "BuyLimit": "0", + "BuyLimit_Day": "0", + "BuyLimit_Week": "0", + "BuyLimit_Month": "2", + "n_ADGapTime": "0" + }, + { + "n_ShopItemID": "7020", + "s_InappID": "", + "n_RandomBagID": "7020", + "n_FirstBonus": "0", + "n_Mileage": "110", + "b_Package": "True", + "n_PriceItemID": "3", + "n_Price": "1900", + "e_BuyCondition": "None", + "BuyLimit": "0", + "BuyLimit_Day": "0", + "BuyLimit_Week": "0", + "BuyLimit_Month": "3", + "n_ADGapTime": "0" + }, + { + "n_ShopItemID": "7101", + "s_InappID": "", + "n_RandomBagID": "7101", + "n_FirstBonus": "0", + "n_Mileage": "55", + "b_Package": "False", + "n_PriceItemID": "3", + "n_Price": "5500", + "e_BuyCondition": "None", + "BuyLimit": "1", + "BuyLimit_Day": "0", + "BuyLimit_Week": "0", + "BuyLimit_Month": "0", + "n_ADGapTime": "0" + }, + { + "n_ShopItemID": "7102", + "s_InappID": "", + "n_RandomBagID": "7102", + "n_FirstBonus": "0", + "n_Mileage": "110", + "b_Package": "False", + "n_PriceItemID": "3", + "n_Price": "11000", + "e_BuyCondition": "None", + "BuyLimit": "1", + "BuyLimit_Day": "0", + "BuyLimit_Week": "0", + "BuyLimit_Month": "0", + "n_ADGapTime": "0" + }, + { + "n_ShopItemID": "7103", + "s_InappID": "", + "n_RandomBagID": "7103", + "n_FirstBonus": "0", + "n_Mileage": "220", + "b_Package": "False", + "n_PriceItemID": "3", + "n_Price": "22000", + "e_BuyCondition": "None", + "BuyLimit": "1", + "BuyLimit_Day": "0", + "BuyLimit_Week": "0", + "BuyLimit_Month": "0", + "n_ADGapTime": "0" + }, + { + "n_ShopItemID": "7104", + "s_InappID": "", + "n_RandomBagID": "7104", + "n_FirstBonus": "0", + "n_Mileage": "110", + "b_Package": "False", + "n_PriceItemID": "3", + "n_Price": "11000", + "e_BuyCondition": "None", + "BuyLimit": "1", + "BuyLimit_Day": "0", + "BuyLimit_Week": "0", + "BuyLimit_Month": "0", + "n_ADGapTime": "0" + }, + { + "n_ShopItemID": "7105", + "s_InappID": "", + "n_RandomBagID": "7105", + "n_FirstBonus": "0", + "n_Mileage": "220", + "b_Package": "False", + "n_PriceItemID": "3", + "n_Price": "22000", + "e_BuyCondition": "None", + "BuyLimit": "1", + "BuyLimit_Day": "0", + "BuyLimit_Week": "0", + "BuyLimit_Month": "0", + "n_ADGapTime": "0" + }, + { + "n_ShopItemID": "7106", + "s_InappID": "", + "n_RandomBagID": "7106", + "n_FirstBonus": "0", + "n_Mileage": "55", + "b_Package": "False", + "n_PriceItemID": "3", + "n_Price": "5500", + "e_BuyCondition": "None", + "BuyLimit": "1", + "BuyLimit_Day": "0", + "BuyLimit_Week": "0", + "BuyLimit_Month": "0", + "n_ADGapTime": "0" + }, + { + "n_ShopItemID": "7107", + "s_InappID": "", + "n_RandomBagID": "7107", + "n_FirstBonus": "0", + "n_Mileage": "110", + "b_Package": "False", + "n_PriceItemID": "3", + "n_Price": "11000", + "e_BuyCondition": "None", + "BuyLimit": "1", + "BuyLimit_Day": "0", + "BuyLimit_Week": "0", + "BuyLimit_Month": "0", + "n_ADGapTime": "0" + }, + { + "n_ShopItemID": "7108", + "s_InappID": "", + "n_RandomBagID": "7108", + "n_FirstBonus": "0", + "n_Mileage": "220", + "b_Package": "False", + "n_PriceItemID": "3", + "n_Price": "22000", + "e_BuyCondition": "None", + "BuyLimit": "1", + "BuyLimit_Day": "0", + "BuyLimit_Week": "0", + "BuyLimit_Month": "0", + "n_ADGapTime": "0" + }, + { + "n_ShopItemID": "7109", + "s_InappID": "", + "n_RandomBagID": "7109", + "n_FirstBonus": "0", + "n_Mileage": "330", + "b_Package": "False", + "n_PriceItemID": "3", + "n_Price": "33000", + "e_BuyCondition": "None", + "BuyLimit": "1", + "BuyLimit_Day": "0", + "BuyLimit_Week": "0", + "BuyLimit_Month": "0", + "n_ADGapTime": "0" + }, + { + "n_ShopItemID": "7110", + "s_InappID": "", + "n_RandomBagID": "7110", + "n_FirstBonus": "0", + "n_Mileage": "990", + "b_Package": "False", + "n_PriceItemID": "3", + "n_Price": "99000", + "e_BuyCondition": "None", + "BuyLimit": "1", + "BuyLimit_Day": "0", + "BuyLimit_Week": "0", + "BuyLimit_Month": "0", + "n_ADGapTime": "0" + }, + { + "n_ShopItemID": "7201", + "s_InappID": "", + "n_RandomBagID": "7201", + "n_FirstBonus": "0", + "n_Mileage": "0", + "b_Package": "True", + "n_PriceItemID": "-1", + "n_Price": "0", + "e_BuyCondition": "None", + "BuyLimit": "0", + "BuyLimit_Day": "0", + "BuyLimit_Week": "15", + "BuyLimit_Month": "0", + "n_ADGapTime": "600" + }, + { + "n_ShopItemID": "7211", + "s_InappID": "", + "n_RandomBagID": "7211", + "n_FirstBonus": "0", + "n_Mileage": "0", + "b_Package": "False", + "n_PriceItemID": "1", + "n_Price": "10", + "e_BuyCondition": "None", + "BuyLimit": "0", + "BuyLimit_Day": "5", + "BuyLimit_Week": "0", + "BuyLimit_Month": "0", + "n_ADGapTime": "0" + }, + { + "n_ShopItemID": "7212", + "s_InappID": "", + "n_RandomBagID": "7212", + "n_FirstBonus": "0", + "n_Mileage": "0", + "b_Package": "False", + "n_PriceItemID": "1", + "n_Price": "11", + "e_BuyCondition": "None", + "BuyLimit": "0", + "BuyLimit_Day": "5", + "BuyLimit_Week": "0", + "BuyLimit_Month": "0", + "n_ADGapTime": "0" + }, + { + "n_ShopItemID": "7213", + "s_InappID": "", + "n_RandomBagID": "7213", + "n_FirstBonus": "0", + "n_Mileage": "0", + "b_Package": "False", + "n_PriceItemID": "1", + "n_Price": "12", + "e_BuyCondition": "None", + "BuyLimit": "0", + "BuyLimit_Day": "5", + "BuyLimit_Week": "0", + "BuyLimit_Month": "0", + "n_ADGapTime": "0" + }, + { + "n_ShopItemID": "7214", + "s_InappID": "", + "n_RandomBagID": "7214", + "n_FirstBonus": "0", + "n_Mileage": "0", + "b_Package": "False", + "n_PriceItemID": "1", + "n_Price": "13", + "e_BuyCondition": "None", + "BuyLimit": "0", + "BuyLimit_Day": "5", + "BuyLimit_Week": "0", + "BuyLimit_Month": "0", + "n_ADGapTime": "0" + }, + { + "n_ShopItemID": "7215", + "s_InappID": "", + "n_RandomBagID": "7215", + "n_FirstBonus": "0", + "n_Mileage": "0", + "b_Package": "False", + "n_PriceItemID": "1", + "n_Price": "14", + "e_BuyCondition": "None", + "BuyLimit": "0", + "BuyLimit_Day": "5", + "BuyLimit_Week": "0", + "BuyLimit_Month": "0", + "n_ADGapTime": "0" + }, + { + "n_ShopItemID": "7216", + "s_InappID": "", + "n_RandomBagID": "7216", + "n_FirstBonus": "0", + "n_Mileage": "0", + "b_Package": "False", + "n_PriceItemID": "1", + "n_Price": "15", + "e_BuyCondition": "None", + "BuyLimit": "0", + "BuyLimit_Day": "5", + "BuyLimit_Week": "0", + "BuyLimit_Month": "0", + "n_ADGapTime": "0" + }, + { + "n_ShopItemID": "7217", + "s_InappID": "", + "n_RandomBagID": "7217", + "n_FirstBonus": "0", + "n_Mileage": "0", + "b_Package": "False", + "n_PriceItemID": "1", + "n_Price": "16", + "e_BuyCondition": "None", + "BuyLimit": "0", + "BuyLimit_Day": "5", + "BuyLimit_Week": "0", + "BuyLimit_Month": "0", + "n_ADGapTime": "0" + }, + { + "n_ShopItemID": "7218", + "s_InappID": "", + "n_RandomBagID": "7218", + "n_FirstBonus": "0", + "n_Mileage": "0", + "b_Package": "False", + "n_PriceItemID": "1", + "n_Price": "17", + "e_BuyCondition": "None", + "BuyLimit": "0", + "BuyLimit_Day": "5", + "BuyLimit_Week": "0", + "BuyLimit_Month": "0", + "n_ADGapTime": "0" + }, + { + "n_ShopItemID": "7219", + "s_InappID": "", + "n_RandomBagID": "7219", + "n_FirstBonus": "0", + "n_Mileage": "0", + "b_Package": "False", + "n_PriceItemID": "1", + "n_Price": "18", + "e_BuyCondition": "None", + "BuyLimit": "0", + "BuyLimit_Day": "5", + "BuyLimit_Week": "0", + "BuyLimit_Month": "0", + "n_ADGapTime": "0" + }, + { + "n_ShopItemID": "7220", + "s_InappID": "", + "n_RandomBagID": "7220", + "n_FirstBonus": "0", + "n_Mileage": "0", + "b_Package": "False", + "n_PriceItemID": "1", + "n_Price": "19", + "e_BuyCondition": "None", + "BuyLimit": "0", + "BuyLimit_Day": "5", + "BuyLimit_Week": "0", + "BuyLimit_Month": "0", + "n_ADGapTime": "0" + }, + { + "n_ShopItemID": "7221", + "s_InappID": "", + "n_RandomBagID": "7221", + "n_FirstBonus": "0", + "n_Mileage": "0", + "b_Package": "False", + "n_PriceItemID": "1", + "n_Price": "20", + "e_BuyCondition": "None", + "BuyLimit": "0", + "BuyLimit_Day": "5", + "BuyLimit_Week": "0", + "BuyLimit_Month": "0", + "n_ADGapTime": "0" + }, + { + "n_ShopItemID": "7222", + "s_InappID": "", + "n_RandomBagID": "7222", + "n_FirstBonus": "0", + "n_Mileage": "0", + "b_Package": "False", + "n_PriceItemID": "1", + "n_Price": "21", + "e_BuyCondition": "None", + "BuyLimit": "0", + "BuyLimit_Day": "5", + "BuyLimit_Week": "0", + "BuyLimit_Month": "0", + "n_ADGapTime": "0" + }, + { + "n_ShopItemID": "7223", + "s_InappID": "", + "n_RandomBagID": "7223", + "n_FirstBonus": "0", + "n_Mileage": "0", + "b_Package": "False", + "n_PriceItemID": "1", + "n_Price": "22", + "e_BuyCondition": "None", + "BuyLimit": "0", + "BuyLimit_Day": "5", + "BuyLimit_Week": "0", + "BuyLimit_Month": "0", + "n_ADGapTime": "0" + }, + { + "n_ShopItemID": "7224", + "s_InappID": "", + "n_RandomBagID": "7224", + "n_FirstBonus": "0", + "n_Mileage": "0", + "b_Package": "False", + "n_PriceItemID": "1", + "n_Price": "23", + "e_BuyCondition": "None", + "BuyLimit": "0", + "BuyLimit_Day": "5", + "BuyLimit_Week": "0", + "BuyLimit_Month": "0", + "n_ADGapTime": "0" + }, + { + "n_ShopItemID": "7301", + "s_InappID": "", + "n_RandomBagID": "7301", + "n_FirstBonus": "0", + "n_Mileage": "0", + "b_Package": "False", + "n_PriceItemID": "-1", + "n_Price": "0", + "e_BuyCondition": "None", + "BuyLimit": "0", + "BuyLimit_Day": "5", + "BuyLimit_Week": "0", + "BuyLimit_Month": "0", + "n_ADGapTime": "600" + }, + { + "n_ShopItemID": "7311", + "s_InappID": "com.nerdnavis.cash1", + "n_RandomBagID": "7311", + "n_FirstBonus": "100", + "n_Mileage": "55", + "b_Package": "False", + "n_PriceItemID": "-2", + "n_Price": "5500", + "e_BuyCondition": "None", + "BuyLimit": "0", + "BuyLimit_Day": "0", + "BuyLimit_Week": "0", + "BuyLimit_Month": "0", + "n_ADGapTime": "0" + }, + { + "n_ShopItemID": "7312", + "s_InappID": "com.nerdnavis.cash2", + "n_RandomBagID": "7312", + "n_FirstBonus": "300", + "n_Mileage": "110", + "b_Package": "False", + "n_PriceItemID": "-2", + "n_Price": "11000", + "e_BuyCondition": "None", + "BuyLimit": "0", + "BuyLimit_Day": "0", + "BuyLimit_Week": "0", + "BuyLimit_Month": "0", + "n_ADGapTime": "0" + }, + { + "n_ShopItemID": "7313", + "s_InappID": "com.nerdnavis.cash3", + "n_RandomBagID": "7313", + "n_FirstBonus": "500", + "n_Mileage": "220", + "b_Package": "False", + "n_PriceItemID": "-2", + "n_Price": "22000", + "e_BuyCondition": "None", + "BuyLimit": "0", + "BuyLimit_Day": "0", + "BuyLimit_Week": "0", + "BuyLimit_Month": "0", + "n_ADGapTime": "0" + }, + { + "n_ShopItemID": "7314", + "s_InappID": "com.nerdnavis.cash4", + "n_RandomBagID": "7314", + "n_FirstBonus": "1000", + "n_Mileage": "550", + "b_Package": "False", + "n_PriceItemID": "-2", + "n_Price": "55000", + "e_BuyCondition": "None", + "BuyLimit": "0", + "BuyLimit_Day": "0", + "BuyLimit_Week": "0", + "BuyLimit_Month": "0", + "n_ADGapTime": "0" + }, + { + "n_ShopItemID": "7315", + "s_InappID": "com.nerdnavis.cash5", + "n_RandomBagID": "7315", + "n_FirstBonus": "3000", + "n_Mileage": "1100", + "b_Package": "False", + "n_PriceItemID": "-2", + "n_Price": "110000", + "e_BuyCondition": "None", + "BuyLimit": "0", + "BuyLimit_Day": "0", + "BuyLimit_Week": "0", + "BuyLimit_Month": "0", + "n_ADGapTime": "0" + }, + { + "n_ShopItemID": "7321", + "s_InappID": "", + "n_RandomBagID": "7321", + "n_FirstBonus": "0", + "n_Mileage": "0", + "b_Package": "False", + "n_PriceItemID": "-1", + "n_Price": "0", + "e_BuyCondition": "None", + "BuyLimit": "0", + "BuyLimit_Day": "5", + "BuyLimit_Week": "0", + "BuyLimit_Month": "0", + "n_ADGapTime": "600" + }, + { + "n_ShopItemID": "7331", + "s_InappID": "", + "n_RandomBagID": "7331", + "n_FirstBonus": "0", + "n_Mileage": "0", + "b_Package": "False", + "n_PriceItemID": "1", + "n_Price": "250", + "e_BuyCondition": "None", + "BuyLimit": "0", + "BuyLimit_Day": "0", + "BuyLimit_Week": "0", + "BuyLimit_Month": "0", + "n_ADGapTime": "0" + }, + { + "n_ShopItemID": "7332", + "s_InappID": "", + "n_RandomBagID": "7332", + "n_FirstBonus": "0", + "n_Mileage": "0", + "b_Package": "False", + "n_PriceItemID": "1", + "n_Price": "500", + "e_BuyCondition": "None", + "BuyLimit": "0", + "BuyLimit_Day": "0", + "BuyLimit_Week": "0", + "BuyLimit_Month": "0", + "n_ADGapTime": "0" + }, + { + "n_ShopItemID": "7333", + "s_InappID": "", + "n_RandomBagID": "7333", + "n_FirstBonus": "0", + "n_Mileage": "0", + "b_Package": "False", + "n_PriceItemID": "1", + "n_Price": "1000", + "e_BuyCondition": "None", + "BuyLimit": "0", + "BuyLimit_Day": "0", + "BuyLimit_Week": "0", + "BuyLimit_Month": "0", + "n_ADGapTime": "0" + }, + { + "n_ShopItemID": "7401", + "s_InappID": "", + "n_RandomBagID": "7401", + "n_FirstBonus": "0", + "n_Mileage": "0", + "b_Package": "False", + "n_PriceItemID": "4", + "n_Price": "5", + "e_BuyCondition": "None", + "BuyLimit": "0", + "BuyLimit_Day": "3", + "BuyLimit_Week": "0", + "BuyLimit_Month": "0", + "n_ADGapTime": "0" + }, + { + "n_ShopItemID": "7402", + "s_InappID": "", + "n_RandomBagID": "7402", + "n_FirstBonus": "0", + "n_Mileage": "0", + "b_Package": "False", + "n_PriceItemID": "4", + "n_Price": "6", + "e_BuyCondition": "None", + "BuyLimit": "0", + "BuyLimit_Day": "3", + "BuyLimit_Week": "0", + "BuyLimit_Month": "0", + "n_ADGapTime": "0" + }, + { + "n_ShopItemID": "7403", + "s_InappID": "", + "n_RandomBagID": "7403", + "n_FirstBonus": "0", + "n_Mileage": "0", + "b_Package": "False", + "n_PriceItemID": "4", + "n_Price": "7", + "e_BuyCondition": "None", + "BuyLimit": "0", + "BuyLimit_Day": "3", + "BuyLimit_Week": "0", + "BuyLimit_Month": "0", + "n_ADGapTime": "0" + }, + { + "n_ShopItemID": "7404", + "s_InappID": "", + "n_RandomBagID": "7404", + "n_FirstBonus": "0", + "n_Mileage": "0", + "b_Package": "False", + "n_PriceItemID": "4", + "n_Price": "8", + "e_BuyCondition": "None", + "BuyLimit": "0", + "BuyLimit_Day": "3", + "BuyLimit_Week": "0", + "BuyLimit_Month": "0", + "n_ADGapTime": "0" + }, + { + "n_ShopItemID": "7405", + "s_InappID": "", + "n_RandomBagID": "7405", + "n_FirstBonus": "0", + "n_Mileage": "0", + "b_Package": "False", + "n_PriceItemID": "4", + "n_Price": "9", + "e_BuyCondition": "None", + "BuyLimit": "0", + "BuyLimit_Day": "3", + "BuyLimit_Week": "0", + "BuyLimit_Month": "0", + "n_ADGapTime": "0" + }, + { + "n_ShopItemID": "7406", + "s_InappID": "", + "n_RandomBagID": "7406", + "n_FirstBonus": "0", + "n_Mileage": "0", + "b_Package": "False", + "n_PriceItemID": "4", + "n_Price": "10", + "e_BuyCondition": "None", + "BuyLimit": "0", + "BuyLimit_Day": "3", + "BuyLimit_Week": "0", + "BuyLimit_Month": "0", + "n_ADGapTime": "0" + }, + { + "n_ShopItemID": "7407", + "s_InappID": "", + "n_RandomBagID": "7407", + "n_FirstBonus": "0", + "n_Mileage": "0", + "b_Package": "False", + "n_PriceItemID": "4", + "n_Price": "11", + "e_BuyCondition": "None", + "BuyLimit": "0", + "BuyLimit_Day": "3", + "BuyLimit_Week": "0", + "BuyLimit_Month": "0", + "n_ADGapTime": "0" + }, + { + "n_ShopItemID": "7408", + "s_InappID": "", + "n_RandomBagID": "7408", + "n_FirstBonus": "0", + "n_Mileage": "0", + "b_Package": "False", + "n_PriceItemID": "4", + "n_Price": "12", + "e_BuyCondition": "None", + "BuyLimit": "0", + "BuyLimit_Day": "10", + "BuyLimit_Week": "0", + "BuyLimit_Month": "0", + "n_ADGapTime": "0" + }, + { + "n_ShopItemID": "7409", + "s_InappID": "", + "n_RandomBagID": "7409", + "n_FirstBonus": "0", + "n_Mileage": "0", + "b_Package": "False", + "n_PriceItemID": "4", + "n_Price": "13", + "e_BuyCondition": "None", + "BuyLimit": "0", + "BuyLimit_Day": "10", + "BuyLimit_Week": "0", + "BuyLimit_Month": "0", + "n_ADGapTime": "0" + }, + { + "n_ShopItemID": "7410", + "s_InappID": "", + "n_RandomBagID": "7410", + "n_FirstBonus": "0", + "n_Mileage": "0", + "b_Package": "False", + "n_PriceItemID": "4", + "n_Price": "14", + "e_BuyCondition": "None", + "BuyLimit": "0", + "BuyLimit_Day": "5", + "BuyLimit_Week": "0", + "BuyLimit_Month": "0", + "n_ADGapTime": "0" + }, + { + "n_ShopItemID": "7411", + "s_InappID": "", + "n_RandomBagID": "7411", + "n_FirstBonus": "0", + "n_Mileage": "0", + "b_Package": "False", + "n_PriceItemID": "4", + "n_Price": "15", + "e_BuyCondition": "None", + "BuyLimit": "0", + "BuyLimit_Day": "5", + "BuyLimit_Week": "0", + "BuyLimit_Month": "0", + "n_ADGapTime": "0" + }, + { + "n_ShopItemID": "7412", + "s_InappID": "", + "n_RandomBagID": "7412", + "n_FirstBonus": "0", + "n_Mileage": "0", + "b_Package": "False", + "n_PriceItemID": "4", + "n_Price": "16", + "e_BuyCondition": "None", + "BuyLimit": "0", + "BuyLimit_Day": "5", + "BuyLimit_Week": "0", + "BuyLimit_Month": "0", + "n_ADGapTime": "0" + }, + { + "n_ShopItemID": "7413", + "s_InappID": "", + "n_RandomBagID": "7413", + "n_FirstBonus": "0", + "n_Mileage": "0", + "b_Package": "False", + "n_PriceItemID": "4", + "n_Price": "17", + "e_BuyCondition": "None", + "BuyLimit": "0", + "BuyLimit_Day": "5", + "BuyLimit_Week": "0", + "BuyLimit_Month": "0", + "n_ADGapTime": "0" + }, + { + "n_ShopItemID": "7414", + "s_InappID": "", + "n_RandomBagID": "7414", + "n_FirstBonus": "0", + "n_Mileage": "0", + "b_Package": "False", + "n_PriceItemID": "4", + "n_Price": "18", + "e_BuyCondition": "None", + "BuyLimit": "0", + "BuyLimit_Day": "5", + "BuyLimit_Week": "0", + "BuyLimit_Month": "0", + "n_ADGapTime": "0" + } +] \ No newline at end of file diff --git a/Assets/ResWork/Table/Server/server_ShopItemList.txt.meta b/Assets/ResWork/Table/Server/server_ShopItemList.txt.meta new file mode 100644 index 000000000..47a66926c --- /dev/null +++ b/Assets/ResWork/Table/Server/server_ShopItemList.txt.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: ac5d80fdd5d39754a8abc702fa443e59 +TextScriptImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Script/Info/InGameInfo.cs b/Assets/Script/Info/InGameInfo.cs index 9c913db9a..cdcb74558 100644 --- a/Assets/Script/Info/InGameInfo.cs +++ b/Assets/Script/Info/InGameInfo.cs @@ -69,6 +69,7 @@ public partial class InGameInfo : MyCoroutine IEnumerator Start() { + DataCheckMgr.Ins.Set(); Set_Init(); while (!TableChecker.Ins.CheckAllLoad()) yield return new WaitForSeconds(0.1f); diff --git a/Assets/Script/Server/ServerClass.cs b/Assets/Script/Server/ServerClass.cs index 81ff93efc..001fd4ac2 100644 --- a/Assets/Script/Server/ServerClass.cs +++ b/Assets/Script/Server/ServerClass.cs @@ -1468,41 +1468,26 @@ public partial class ServerData #endregion #region Common - public void Init_Daily() + public void Init_Daily(List> farmshop) { Set_Common(eCommon.DOY_Day, ServerInfo.ServerTime.DayOfYear); - Farm.Shop = table_farmshoplist.Ins.Get_ShopInit(); - if (!DSUtil.CheckNull(FarmShopUI.Ins) && FarmShopUI.Ins.isActiveAndEnabled) FarmShopUI.Ins.Set(); + Farm.Shop = farmshop; Init_DungeonTicket(); - - - Set_Common(eCommon.Roullette_Count, 0); - Set_Common(eCommon.Roullette_LuckyCount, 0); - Set_Common(eCommon.Roullette_ADCount, 0); - //Init_Mission(1); // TODO 정인호 : 일일 미션 초기화 - Init_Pass(); + Init_Mission(1); Init_Shop(); - //var amount = 1 - Get_ItemAmount(eItem.MemoryField); - //if (amount > 0) Add_Item(new ItemData(eItem.MemoryField, 0, amount)); - //amount = 2 - Get_ItemAmount(eItem.MemoryForest); - //if (amount > 0) Add_Item(new ItemData(eItem.MemoryForest, 0, amount)); - //amount = 1 - Get_ItemAmount(eItem.MemoryDungeon); - //if (amount > 0) Add_Item(new ItemData(eItem.MemoryDungeon, 0, amount)); - //amount = 1 - Get_ItemAmount(eItem.MemoryWitchGrade); - //if (amount > 0) Add_Item(new ItemData(eItem.MemoryWitchGrade, 0, amount)); - //amount = 5 - Get_ItemAmount(eItem.MemoryPetBattle); - //if (amount > 0) Add_Item(new ItemData(eItem.MemoryPetBattle, 0, amount)); - //Memory[4] = 0; Memory[4].RandomizeCryptoKey(); + // TODO 정인호 : 룰렛 기획 없음 + //Set_Common(eCommon.Roullette_Count, 0); + //Set_Common(eCommon.Roullette_LuckyCount, 0); + //Set_Common(eCommon.Roullette_ADCount, 0); - if (GameUI.Ins != null) GameUI.Ins.LobbyUI.Set_Noti(); + //Init_Pass(); // TODO 정인호 : 패스 기획 없음 } public void Init_Week(int numweek) { Set_Common(eCommon.DOY_Week, numweek); - LastTime = ServerInfo.ServerTime; Init_ShopWeek(); - //Init_Mission(2); // TODO 정인호 : 주간 미션 초기화 + Init_Mission(2); } public void Init_Month() { @@ -3033,6 +3018,11 @@ public class SD_FarmSlot_Read #endregion #region 서버 응답 클래스 +public class SC_InitResult +{ + public int error; + public List> farmshop; +} public class SC_Items { public int itemid, amount; diff --git a/Assets/Script/Server/ServerInfo.cs b/Assets/Script/Server/ServerInfo.cs index c63b51cd4..d2b210a95 100644 --- a/Assets/Script/Server/ServerInfo.cs +++ b/Assets/Script/Server/ServerInfo.cs @@ -358,7 +358,6 @@ public class ServerInfo : MyCoroutine newUser = true; } - DataCheckMgr.Ins.Set(); OptionInfo.Ins.Set_UI(); // 서버 데이터 가져오기 완료 @@ -791,6 +790,34 @@ public class ServerInfo : MyCoroutine }); } + public void Save_Init(Action _act) + { + PlayFabClientAPI.ExecuteCloudScript(new ExecuteCloudScriptRequest + { + FunctionName = MethodBase.GetCurrentMethod().Name, + GeneratePlayStreamEvent = true, + FunctionParameter = new + { + Token = m_LoginInfo.EntityToken.EntityToken, + } + }, + result => + { + if (result.Error == null) + { // (0 일일 초기화만, 1 주간 초기화까지, 2 월간 초기화까지, 3 초기화 없음) + var str_result = result.FunctionResult.ToString(); + var error = MyErrorCheck(str_result); + _act?.Invoke(JsonConvert.DeserializeObject(str_result)); + } + else + Set_Coroutine(() => { Save_Init(_act); }, 2f); + }, + fail => + { + Set_Coroutine(() => { Save_Init(_act); }, 2f); + }); + } + public void Save_StageResult(Action _act = null) { NetWait.Ins.Set(true); diff --git a/Assets/Script/Util/DataCheckMgr.cs b/Assets/Script/Util/DataCheckMgr.cs index 3df3afc8c..62232bb8b 100644 --- a/Assets/Script/Util/DataCheckMgr.cs +++ b/Assets/Script/Util/DataCheckMgr.cs @@ -51,19 +51,34 @@ public class DataCheckMgr : MyCoroutine IEnumerator Co_1Sec() { var sdata = ServerInfo.Ins.m_ServerData; + bool checkinit = false, callinit = false; while (true) { - // 다음날이 됐을 때, 일일 데이터 초기화 - if (sdata.Get_Common(eCommon.DOY_Day) != ServerInfo.ServerTime.DayOfYear) - sdata.Init_Daily(); - // 다음주가 됐을 때, 주간 데이터 초기화 - int weekNum = SamplesCalendar.Get_WeekOfYear(ServerInfo.ServerTime); - if (sdata.Get_Common(eCommon.DOY_Week) != weekNum) - sdata.Init_Week(weekNum); - // 다음달이 됐을 때, 주간 데이터 초기화 - if (sdata.Get_Common(eCommon.DOY_Month) != ServerInfo.ServerTime.Month) - sdata.Init_Month(); + // 게임 접속 중에 다음날이 됐을 때 + if (!checkinit && sdata.Get_Common(eCommon.DOY_Day) != ServerInfo.ServerTime.DayOfYear) + checkinit = true; + if (checkinit && !callinit) + { + callinit = true; + ServerInfo.Ins.Save_Init(result => + { + checkinit = false; + callinit = false; + switch (result.error) + { + case 0: + sdata.Init_Daily(DSUtil.Get_T_List(result.farmshop)); + break; + case 1: + sdata.Init_Week(SamplesCalendar.Get_WeekOfYear(ServerInfo.ServerTime)); + break; + case 2: + sdata.Init_Month(); + break; + } + }); + } yield return new WaitForSeconds(1f); diff --git a/Assets/Script/Util/ErrorLogHookManager.cs b/Assets/Script/Util/ErrorLogHookManager.cs index 6bfa0b024..3f710c2c4 100644 --- a/Assets/Script/Util/ErrorLogHookManager.cs +++ b/Assets/Script/Util/ErrorLogHookManager.cs @@ -48,10 +48,6 @@ public partial class SROptions { ServerInfo.Ins.Save_CheatItem(ID, Amount, () => { ServerInfo.Ins.m_ServerData.Add_Item(ID, Amount); }); } - public void Init_Daily() - { - ServerInfo.Ins.m_ServerData.Init_Daily(); - } public void Add_AllSkillLv() { var lst = table_skilllist.Ins.Get_DataList();