diff --git a/Assets/Editor/GetServerTables.cs b/Assets/Editor/GetServerTables.cs index 6dadc7d97..a2ac001b9 100644 --- a/Assets/Editor/GetServerTables.cs +++ b/Assets/Editor/GetServerTables.cs @@ -16,6 +16,7 @@ public class GetServerTables Get_ServerTable("EquipItemList", new List { "s_ItemPrefab_LH", "s_ItemPrefab_RH", "e_EquipAttribute", "e_AbilityType1", "e_AbilityType2", "e_AbilityType3", "n_AbilityValue1", "n_AbilityValue2", "n_AbilityValue3" }); Get_ServerTable("EquipSmelting", new List { "n_IncreaseValueRate" }); Get_ServerTable("SkillList", new List { "exception", "n_MP", "f_CoolTime", "f_SkillRange", "s_Animation", "s_NextAnimation", "f_CastingTime", "e_SkillTarget", "n_DefaultValue", "f_LevelPerValue", "f_BalanceConstant", "e_SkillExtraType", "f_ExtraValue1", "f_ExtraValue1_비고", "f_ExtraValue2", "f_ExtraValue2_비고", "f_ExtraValue3", "f_ExtraValue3_비고", "f_ExtraValue4", "f_ExtraValue4_비고" }); + Get_ServerTable("GlobalValue", new List { "exception" }); } 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 608b0d353..50eeef9ee 100644 --- a/Assets/PlayFabEditorExtensions/Editor/Resources/.CloudScript.js +++ b/Assets/PlayFabEditorExtensions/Editor/Resources/.CloudScript.js @@ -1428,6 +1428,36 @@ handlers.Save_Skill_Awaken = function(args) } return Get_Return(1); } + +handlers.Save_Pet_Gacha = function(args) +{ + var readonlydata = Get_UserReadOnlyData(); + var error = Get_Error(readonlydata, args.Token); + if (error < 0) return Get_Return(error); + + var urod = Get_JsonUserData(readonlydata); + + var amount = args.Amount; + if (urod.AD) + { + var curTime = Get_CurKoreaTime(); + var adTime = new Date(urod.PetGachaADTime); + if (adTime > curTime) return Get_Return(2); + amount = 1; + urod.PetGachaADTime = new Date(curTime.getTime() + Get_GlobalValue_nValue("n_AddPetGachaADMinute") * 60000).toISOString(); + } + + var table = Get_MissionTable(); + var price = amount * Get_GlobalValue_nValue("n_CostPerPetGacha"); + if (urod.AD || Use_Item(table, urod, 1, price)) + { + + + Set_JsonUserData(urod); + return Get_Return(0); + } + return Get_Return(1); +} /////////////////////////////////// 서버 처리 handlers.Write_UnityInApp = function(args) @@ -9847,372 +9877,307 @@ function Get_ClassOpenTable() function Get_GlobalValueTable() { return [ - { - "s_ID": "n_CashItemID", - "n_Value": "1", - "exception": "캐쉬 아이템 id" - }, - { - "s_ID": "n_JewelItemID", - "n_Value": "3", - "exception": "보석 아이템 id" - }, - { - "s_ID": "ATK", - "n_Value": "1", - "exception": "sss" - }, - { - "s_ID": "HP", - "n_Value": "100", - "exception": "sss" - }, - { - "s_ID": "DEF", - "n_Value": "1", - "exception": "sss" - }, - { - "s_ID": "M_DEF", - "n_Value": "1", - "exception": "sss" - }, - { - "s_ID": "ATK_Multiplier", - "n_Value": "0", - "exception": "sss" - }, - { - "s_ID": "HP_Multiplier", - "n_Value": "0", - "exception": "sss" - }, - { - "s_ID": "DEF_Multiplier", - "n_Value": "0", - "exception": "sss" - }, - { - "s_ID": "M_DEF_Multiplier", - "n_Value": "0", - "exception": "sss" - }, - { - "s_ID": "MP", - "n_Value": "30", - "exception": "sss" - }, - { - "s_ID": "MP_Multiplier", - "n_Value": "0", - "exception": "sss" - }, - { - "s_ID": "ATK_FIXED", - "n_Value": "0", - "exception": "" - }, - { - "s_ID": "ATK_FIXED_DECREASE", - "n_Value": "0", - "exception": "" - }, - { - "s_ID": "CRI", - "n_Value": "0", - "exception": "" - }, - { - "s_ID": "CRI_DMG_Multiplier", - "n_Value": "10", - "exception": "" - }, - { - "s_ID": "M_CRI", - "n_Value": "100", - "exception": "" - }, - { - "s_ID": "M_CRI_DMG_Multiplier", - "n_Value": "0.1", - "exception": "" - }, - { - "s_ID": "SKILL_Multiplier", - "n_Value": "0", - "exception": "" - }, - { - "s_ID": "COOLTIME_Multiplier", - "n_Value": "0", - "exception": "" - }, - { - "s_ID": "HERO_ATK_SPD", - "n_Value": "0.75", - "exception": "" - }, - { - "s_ID": "ATK_SPD_Multiplier", - "n_Value": "1", - "exception": "" - }, - { - "s_ID": "HERO_MOVE_SPD", - "n_Value": "3", - "exception": "" - }, - { - "s_ID": "MOVE_SPD_Multiplier", - "n_Value": "1", - "exception": "" - }, - { - "s_ID": "HP_REGEN", - "n_Value": "1", - "exception": "" - }, - { - "s_ID": "MP_REGEN", - "n_Value": "3", - "exception": "" - }, - { - "s_ID": "HP_REGEN_Multiplier", - "n_Value": "0", - "exception": "" - }, - { - "s_ID": "MP_REGEN_Multiplier", - "n_Value": "0", - "exception": "" - }, - { - "s_ID": "PIERCING_Multiplier", - "n_Value": "0", - "exception": "" - }, - { - "s_ID": "DMG_Multiplier", - "n_Value": "0", - "exception": "" - }, - { - "s_ID": "GOLD_INCREASE", - "n_Value": "0", - "exception": "" - }, - { - "s_ID": "GOLD_Multiplier", - "n_Value": "0", - "exception": "" - }, - { - "s_ID": "EXP_Multiplier", - "n_Value": "0", - "exception": "" - }, - { - "s_ID": "ITEM_Multiplier", - "n_Value": "0", - "exception": "" - }, - { - "s_ID": "EnchantOpenLv1", - "n_Value": "0", - "exception": "" - }, - { - "s_ID": "EnchantOpenLv2", - "n_Value": "10", - "exception": "" - }, - { - "s_ID": "EnchantOpenLv3", - "n_Value": "20", - "exception": "" - }, - { - "s_ID": "Defense_Coefficient", - "n_Value": "6", - "exception": "" - }, - { - "s_ID": "f_PC_FindEnemyRange", - "n_Value": "6", - "exception": "" - }, - { - "s_ID": "f_Pet_FindEnemyRange", - "n_Value": "5", - "exception": "" - }, - { - "s_ID": "f_AvoidCoolTime", - "n_Value": "5", - "exception": "" - }, - { - "s_ID": "f_KnockbackTime", - "n_Value": "0.02", - "exception": "" - }, - { - "s_ID": "f_SkillTeamRange", - "n_Value": "15", - "exception": "" - }, - { - "s_ID": "n_AbilityMaterialID", - "n_Value": "444", - "exception": "" - }, - { - "s_ID": "n_JobMaterialID", - "n_Value": "445", - "exception": "" - }, - { - "s_ID": "AWAKEN_GOODS_UPGRADE", - "n_Value": "450", - "exception": "" - }, - { - "s_ID": "AWAKEN_GOODS_STR", - "n_Value": "451", - "exception": "" - }, - { - "s_ID": "AWAKEN_GOODS_DEX", - "n_Value": "452", - "exception": "" - }, - { - "s_ID": "AWAKEN_GOODS_INT", - "n_Value": "453", - "exception": "" - }, - { - "s_ID": "AWAKEN_GOODS_LUK", - "n_Value": "454", - "exception": "" - }, - { - "s_ID": "AWAKEN_GOODS_ALL", - "n_Value": "455", - "exception": "" - }, - { - "s_ID": "n_BreakingLimitSlotMaterialID", - "n_Value": "461", - "exception": "" - }, - { - "s_ID": "n_FirstEquipPet", - "n_Value": "50002", - "exception": "" - }, - { - "s_ID": "n_PetReinforceMaterialID", - "n_Value": "441", - "exception": "" - }, - { - "s_ID": "n_PetReinforcePriceOptionID1", - "n_Value": "340001", - "exception": "" - }, - { - "s_ID": "n_PetReinforcePriceOptionID2", - "n_Value": "340002", - "exception": "" - }, - { - "s_ID": "n_PetReinforcePriceOptionID3", - "n_Value": "340003", - "exception": "" - }, - { - "s_ID": "n_PetSkillAwaken_Lv1", - "n_Value": "10", - "exception": "" - }, - { - "s_ID": "n_PetSkillAwaken_Lv2", - "n_Value": "20", - "exception": "" - }, - { - "s_ID": "n_PetSkillAwaken_Lv3", - "n_Value": "40", - "exception": "" - }, - { - "s_ID": "n_EssenceMileageID", - "n_Value": "471", - "exception": "" - }, - { - "s_ID": "n_EssenceRandomBagID", - "n_Value": "9800001", - "exception": "" - }, - { - "s_ID": "n_RelicMaxStar", - "n_Value": "5", - "exception": "" - }, - { - "s_ID": "n_RelicReinforceMaterialID", - "n_Value": "472", - "exception": "" - }, - { - "s_ID": "n_FarmSeedID", - "n_Value": "456", - "exception": "" - }, - { - "s_ID": "n_FarmPlantingSeedAmount", - "n_Value": "5", - "exception": "" - }, - { - "s_ID": "n_FirstClassID", - "n_Value": "10501", - "exception": "최초 시작 직업" - }, - { - "s_ID": "MazeMapCount", - "n_Value": "2", - "exception": "미궁 맵 개수" - }, - { - "s_ID": "GoldDropRandomRange", - "n_Value": "0.1", - "exception": "몬스터 드랍 골드양 범위" - }, - { - "s_ID": "n_Benefit1Count", - "n_Value": "10", - "exception": "뽑기 혜택1 횟수" - }, - { - "s_ID": "n_Benefit2Count", - "n_Value": "50", - "exception": "뽑기 혜택2 횟수" - }, - { - "s_ID": "n_Benefit1Grade", - "n_Value": "4", - "exception": "뽑기 혜택1 등급" - }, - { - "s_ID": "n_Benefit2Grade", - "n_Value": "5", - "exception": "뽑기 혜택2 등급" - } - ]; + { + "s_ID": "n_CashItemID", + "n_Value": "1" + }, + { + "s_ID": "n_JewelItemID", + "n_Value": "3" + }, + { + "s_ID": "ATK", + "n_Value": "1" + }, + { + "s_ID": "HP", + "n_Value": "100" + }, + { + "s_ID": "DEF", + "n_Value": "1" + }, + { + "s_ID": "M_DEF", + "n_Value": "1" + }, + { + "s_ID": "ATK_Multiplier", + "n_Value": "0" + }, + { + "s_ID": "HP_Multiplier", + "n_Value": "0" + }, + { + "s_ID": "DEF_Multiplier", + "n_Value": "0" + }, + { + "s_ID": "M_DEF_Multiplier", + "n_Value": "0" + }, + { + "s_ID": "MP", + "n_Value": "30" + }, + { + "s_ID": "MP_Multiplier", + "n_Value": "0" + }, + { + "s_ID": "ATK_FIXED", + "n_Value": "0" + }, + { + "s_ID": "ATK_FIXED_DECREASE", + "n_Value": "0" + }, + { + "s_ID": "CRI", + "n_Value": "0" + }, + { + "s_ID": "CRI_DMG_Multiplier", + "n_Value": "10" + }, + { + "s_ID": "M_CRI", + "n_Value": "100" + }, + { + "s_ID": "M_CRI_DMG_Multiplier", + "n_Value": "0.1" + }, + { + "s_ID": "SKILL_Multiplier", + "n_Value": "0" + }, + { + "s_ID": "COOLTIME_Multiplier", + "n_Value": "0" + }, + { + "s_ID": "HERO_ATK_SPD", + "n_Value": "0.75" + }, + { + "s_ID": "ATK_SPD_Multiplier", + "n_Value": "1" + }, + { + "s_ID": "HERO_MOVE_SPD", + "n_Value": "3" + }, + { + "s_ID": "MOVE_SPD_Multiplier", + "n_Value": "1" + }, + { + "s_ID": "HP_REGEN", + "n_Value": "1" + }, + { + "s_ID": "MP_REGEN", + "n_Value": "3" + }, + { + "s_ID": "HP_REGEN_Multiplier", + "n_Value": "0" + }, + { + "s_ID": "MP_REGEN_Multiplier", + "n_Value": "0" + }, + { + "s_ID": "PIERCING_Multiplier", + "n_Value": "0" + }, + { + "s_ID": "DMG_Multiplier", + "n_Value": "0" + }, + { + "s_ID": "GOLD_INCREASE", + "n_Value": "0" + }, + { + "s_ID": "GOLD_Multiplier", + "n_Value": "0" + }, + { + "s_ID": "EXP_Multiplier", + "n_Value": "0" + }, + { + "s_ID": "ITEM_Multiplier", + "n_Value": "0" + }, + { + "s_ID": "EnchantOpenLv1", + "n_Value": "0" + }, + { + "s_ID": "EnchantOpenLv2", + "n_Value": "10" + }, + { + "s_ID": "EnchantOpenLv3", + "n_Value": "20" + }, + { + "s_ID": "Defense_Coefficient", + "n_Value": "6" + }, + { + "s_ID": "f_PC_FindEnemyRange", + "n_Value": "6" + }, + { + "s_ID": "f_Pet_FindEnemyRange", + "n_Value": "5" + }, + { + "s_ID": "f_AvoidCoolTime", + "n_Value": "5" + }, + { + "s_ID": "f_KnockbackTime", + "n_Value": "0.02" + }, + { + "s_ID": "f_SkillTeamRange", + "n_Value": "15" + }, + { + "s_ID": "n_AbilityMaterialID", + "n_Value": "444" + }, + { + "s_ID": "n_JobMaterialID", + "n_Value": "445" + }, + { + "s_ID": "AWAKEN_GOODS_UPGRADE", + "n_Value": "450" + }, + { + "s_ID": "AWAKEN_GOODS_STR", + "n_Value": "451" + }, + { + "s_ID": "AWAKEN_GOODS_DEX", + "n_Value": "452" + }, + { + "s_ID": "AWAKEN_GOODS_INT", + "n_Value": "453" + }, + { + "s_ID": "AWAKEN_GOODS_LUK", + "n_Value": "454" + }, + { + "s_ID": "AWAKEN_GOODS_ALL", + "n_Value": "455" + }, + { + "s_ID": "n_BreakingLimitSlotMaterialID", + "n_Value": "461" + }, + { + "s_ID": "n_FirstEquipPet", + "n_Value": "50002" + }, + { + "s_ID": "n_PetReinforceMaterialID", + "n_Value": "441" + }, + { + "s_ID": "n_PetReinforcePriceOptionID1", + "n_Value": "340001" + }, + { + "s_ID": "n_PetReinforcePriceOptionID2", + "n_Value": "340002" + }, + { + "s_ID": "n_PetReinforcePriceOptionID3", + "n_Value": "340003" + }, + { + "s_ID": "n_PetSkillAwaken_Lv1", + "n_Value": "10" + }, + { + "s_ID": "n_PetSkillAwaken_Lv2", + "n_Value": "20" + }, + { + "s_ID": "n_PetSkillAwaken_Lv3", + "n_Value": "40" + }, + { + "s_ID": "n_AddPetGachaADMinute", + "n_Value": "10" + }, + { + "s_ID": "n_CostPerPetGacha", + "n_Value": "100" + }, + { + "s_ID": "n_EssenceMileageID", + "n_Value": "471" + }, + { + "s_ID": "n_EssenceRandomBagID", + "n_Value": "9800001" + }, + { + "s_ID": "n_RelicMaxStar", + "n_Value": "5" + }, + { + "s_ID": "n_RelicReinforceMaterialID", + "n_Value": "472" + }, + { + "s_ID": "n_FarmSeedID", + "n_Value": "456" + }, + { + "s_ID": "n_FarmPlantingSeedAmount", + "n_Value": "5" + }, + { + "s_ID": "n_FirstClassID", + "n_Value": "10501" + }, + { + "s_ID": "MazeMapCount", + "n_Value": "2" + }, + { + "s_ID": "GoldDropRandomRange", + "n_Value": "0.1" + }, + { + "s_ID": "n_Benefit1Count", + "n_Value": "10" + }, + { + "s_ID": "n_Benefit2Count", + "n_Value": "50" + }, + { + "s_ID": "n_Benefit1Grade", + "n_Value": "4" + }, + { + "s_ID": "n_Benefit2Grade", + "n_Value": "5" + } + ] } function Get_GlobalValue_nValue(key) { diff --git a/Assets/ResWork/Table/Export/GlobalValue.json b/Assets/ResWork/Table/Export/GlobalValue.json index 2cb54a982..a732af369 100644 --- a/Assets/ResWork/Table/Export/GlobalValue.json +++ b/Assets/ResWork/Table/Export/GlobalValue.json @@ -1 +1 @@ -[{"s_ID": "n_CashItemID", "n_Value": "1", "exception": "캐쉬 아이템 id"}, {"s_ID": "n_JewelItemID", "n_Value": "3", "exception": "보석 아이템 id"}, {"s_ID": "ATK", "n_Value": "1", "exception": "sss"}, {"s_ID": "HP", "n_Value": "100", "exception": "sss"}, {"s_ID": "DEF", "n_Value": "1", "exception": "sss"}, {"s_ID": "M_DEF", "n_Value": "1", "exception": "sss"}, {"s_ID": "ATK_Multiplier", "n_Value": "0", "exception": "sss"}, {"s_ID": "HP_Multiplier", "n_Value": "0", "exception": "sss"}, {"s_ID": "DEF_Multiplier", "n_Value": "0", "exception": "sss"}, {"s_ID": "M_DEF_Multiplier", "n_Value": "0", "exception": "sss"}, {"s_ID": "MP", "n_Value": "30", "exception": "sss"}, {"s_ID": "MP_Multiplier", "n_Value": "0", "exception": "sss"}, {"s_ID": "ATK_FIXED", "n_Value": "0", "exception": ""}, {"s_ID": "ATK_FIXED_DECREASE", "n_Value": "0", "exception": ""}, {"s_ID": "CRI", "n_Value": "0", "exception": ""}, {"s_ID": "CRI_DMG_Multiplier", "n_Value": "10", "exception": ""}, {"s_ID": "M_CRI", "n_Value": "100", "exception": ""}, {"s_ID": "M_CRI_DMG_Multiplier", "n_Value": "0.1", "exception": ""}, {"s_ID": "SKILL_Multiplier", "n_Value": "0", "exception": ""}, {"s_ID": "COOLTIME_Multiplier", "n_Value": "0", "exception": ""}, {"s_ID": "HERO_ATK_SPD", "n_Value": "0.75", "exception": ""}, {"s_ID": "ATK_SPD_Multiplier", "n_Value": "1", "exception": ""}, {"s_ID": "HERO_MOVE_SPD", "n_Value": "3", "exception": ""}, {"s_ID": "MOVE_SPD_Multiplier", "n_Value": "1", "exception": ""}, {"s_ID": "HP_REGEN", "n_Value": "1", "exception": ""}, {"s_ID": "MP_REGEN", "n_Value": "3", "exception": ""}, {"s_ID": "HP_REGEN_Multiplier", "n_Value": "0", "exception": ""}, {"s_ID": "MP_REGEN_Multiplier", "n_Value": "0", "exception": ""}, {"s_ID": "PIERCING_Multiplier", "n_Value": "0", "exception": ""}, {"s_ID": "DMG_Multiplier", "n_Value": "0", "exception": ""}, {"s_ID": "GOLD_INCREASE", "n_Value": "0", "exception": ""}, {"s_ID": "GOLD_Multiplier", "n_Value": "0", "exception": ""}, {"s_ID": "EXP_Multiplier", "n_Value": "0", "exception": ""}, {"s_ID": "ITEM_Multiplier", "n_Value": "0", "exception": ""}, {"s_ID": "EnchantOpenLv1", "n_Value": "0", "exception": ""}, {"s_ID": "EnchantOpenLv2", "n_Value": "10", "exception": ""}, {"s_ID": "EnchantOpenLv3", "n_Value": "20", "exception": ""}, {"s_ID": "Defense_Coefficient", "n_Value": "6", "exception": ""}, {"s_ID": "f_PC_FindEnemyRange", "n_Value": "6", "exception": ""}, {"s_ID": "f_Pet_FindEnemyRange", "n_Value": "5", "exception": ""}, {"s_ID": "f_AvoidCoolTime", "n_Value": "5", "exception": ""}, {"s_ID": "f_KnockbackTime", "n_Value": "0.02", "exception": ""}, {"s_ID": "f_SkillTeamRange", "n_Value": "15", "exception": ""}, {"s_ID": "n_AbilityMaterialID", "n_Value": "444", "exception": ""}, {"s_ID": "n_JobMaterialID", "n_Value": "445", "exception": ""}, {"s_ID": "AWAKEN_GOODS_UPGRADE", "n_Value": "450", "exception": ""}, {"s_ID": "AWAKEN_GOODS_STR", "n_Value": "451", "exception": ""}, {"s_ID": "AWAKEN_GOODS_DEX", "n_Value": "452", "exception": ""}, {"s_ID": "AWAKEN_GOODS_INT", "n_Value": "453", "exception": ""}, {"s_ID": "AWAKEN_GOODS_LUK", "n_Value": "454", "exception": ""}, {"s_ID": "AWAKEN_GOODS_ALL", "n_Value": "455", "exception": ""}, {"s_ID": "n_BreakingLimitSlotMaterialID", "n_Value": "461", "exception": ""}, {"s_ID": "n_FirstEquipPet", "n_Value": "50002", "exception": ""}, {"s_ID": "n_PetReinforceMaterialID", "n_Value": "441", "exception": ""}, {"s_ID": "n_PetReinforcePriceOptionID1", "n_Value": "340001", "exception": ""}, {"s_ID": "n_PetReinforcePriceOptionID2", "n_Value": "340002", "exception": ""}, {"s_ID": "n_PetReinforcePriceOptionID3", "n_Value": "340003", "exception": ""}, {"s_ID": "n_PetSkillAwaken_Lv1", "n_Value": "10", "exception": ""}, {"s_ID": "n_PetSkillAwaken_Lv2", "n_Value": "20", "exception": ""}, {"s_ID": "n_PetSkillAwaken_Lv3", "n_Value": "40", "exception": ""}, {"s_ID": "n_EssenceMileageID", "n_Value": "471", "exception": ""}, {"s_ID": "n_EssenceRandomBagID", "n_Value": "9800001", "exception": ""}, {"s_ID": "n_RelicMaxStar", "n_Value": "5", "exception": ""}, {"s_ID": "n_RelicReinforceMaterialID", "n_Value": "472", "exception": ""}, {"s_ID": "n_FarmSeedID", "n_Value": "456", "exception": ""}, {"s_ID": "n_FarmPlantingSeedAmount", "n_Value": "5", "exception": ""}, {"s_ID": "n_FirstClassID", "n_Value": "10501", "exception": "최초 시작 직업"}, {"s_ID": "MazeMapCount", "n_Value": "2", "exception": "미궁 맵 개수"}, {"s_ID": "GoldDropRandomRange", "n_Value": "0.1", "exception": "몬스터 드랍 골드양 범위"}, {"s_ID": "n_Benefit1Count", "n_Value": "10", "exception": "뽑기 혜택1 횟수"}, {"s_ID": "n_Benefit2Count", "n_Value": "50", "exception": "뽑기 혜택2 횟수"}, {"s_ID": "n_Benefit1Grade", "n_Value": "4", "exception": "뽑기 혜택1 등급"}, {"s_ID": "n_Benefit2Grade", "n_Value": "5", "exception": "뽑기 혜택2 등급"}] \ No newline at end of file +[{"s_ID": "n_CashItemID", "n_Value": "1", "exception": "캐쉬 아이템 id"}, {"s_ID": "n_JewelItemID", "n_Value": "3", "exception": "보석 아이템 id"}, {"s_ID": "ATK", "n_Value": "1", "exception": "sss"}, {"s_ID": "HP", "n_Value": "100", "exception": "sss"}, {"s_ID": "DEF", "n_Value": "1", "exception": "sss"}, {"s_ID": "M_DEF", "n_Value": "1", "exception": "sss"}, {"s_ID": "ATK_Multiplier", "n_Value": "0", "exception": "sss"}, {"s_ID": "HP_Multiplier", "n_Value": "0", "exception": "sss"}, {"s_ID": "DEF_Multiplier", "n_Value": "0", "exception": "sss"}, {"s_ID": "M_DEF_Multiplier", "n_Value": "0", "exception": "sss"}, {"s_ID": "MP", "n_Value": "30", "exception": "sss"}, {"s_ID": "MP_Multiplier", "n_Value": "0", "exception": "sss"}, {"s_ID": "ATK_FIXED", "n_Value": "0", "exception": ""}, {"s_ID": "ATK_FIXED_DECREASE", "n_Value": "0", "exception": ""}, {"s_ID": "CRI", "n_Value": "0", "exception": ""}, {"s_ID": "CRI_DMG_Multiplier", "n_Value": "10", "exception": ""}, {"s_ID": "M_CRI", "n_Value": "100", "exception": ""}, {"s_ID": "M_CRI_DMG_Multiplier", "n_Value": "0.1", "exception": ""}, {"s_ID": "SKILL_Multiplier", "n_Value": "0", "exception": ""}, {"s_ID": "COOLTIME_Multiplier", "n_Value": "0", "exception": ""}, {"s_ID": "HERO_ATK_SPD", "n_Value": "0.75", "exception": ""}, {"s_ID": "ATK_SPD_Multiplier", "n_Value": "1", "exception": ""}, {"s_ID": "HERO_MOVE_SPD", "n_Value": "3", "exception": ""}, {"s_ID": "MOVE_SPD_Multiplier", "n_Value": "1", "exception": ""}, {"s_ID": "HP_REGEN", "n_Value": "1", "exception": ""}, {"s_ID": "MP_REGEN", "n_Value": "3", "exception": ""}, {"s_ID": "HP_REGEN_Multiplier", "n_Value": "0", "exception": ""}, {"s_ID": "MP_REGEN_Multiplier", "n_Value": "0", "exception": ""}, {"s_ID": "PIERCING_Multiplier", "n_Value": "0", "exception": ""}, {"s_ID": "DMG_Multiplier", "n_Value": "0", "exception": ""}, {"s_ID": "GOLD_INCREASE", "n_Value": "0", "exception": ""}, {"s_ID": "GOLD_Multiplier", "n_Value": "0", "exception": ""}, {"s_ID": "EXP_Multiplier", "n_Value": "0", "exception": ""}, {"s_ID": "ITEM_Multiplier", "n_Value": "0", "exception": ""}, {"s_ID": "EnchantOpenLv1", "n_Value": "0", "exception": ""}, {"s_ID": "EnchantOpenLv2", "n_Value": "10", "exception": ""}, {"s_ID": "EnchantOpenLv3", "n_Value": "20", "exception": ""}, {"s_ID": "Defense_Coefficient", "n_Value": "6", "exception": ""}, {"s_ID": "f_PC_FindEnemyRange", "n_Value": "6", "exception": ""}, {"s_ID": "f_Pet_FindEnemyRange", "n_Value": "5", "exception": ""}, {"s_ID": "f_AvoidCoolTime", "n_Value": "5", "exception": ""}, {"s_ID": "f_KnockbackTime", "n_Value": "0.02", "exception": ""}, {"s_ID": "f_SkillTeamRange", "n_Value": "15", "exception": ""}, {"s_ID": "n_AbilityMaterialID", "n_Value": "444", "exception": ""}, {"s_ID": "n_JobMaterialID", "n_Value": "445", "exception": ""}, {"s_ID": "AWAKEN_GOODS_UPGRADE", "n_Value": "450", "exception": ""}, {"s_ID": "AWAKEN_GOODS_STR", "n_Value": "451", "exception": ""}, {"s_ID": "AWAKEN_GOODS_DEX", "n_Value": "452", "exception": ""}, {"s_ID": "AWAKEN_GOODS_INT", "n_Value": "453", "exception": ""}, {"s_ID": "AWAKEN_GOODS_LUK", "n_Value": "454", "exception": ""}, {"s_ID": "AWAKEN_GOODS_ALL", "n_Value": "455", "exception": ""}, {"s_ID": "n_BreakingLimitSlotMaterialID", "n_Value": "461", "exception": ""}, {"s_ID": "n_FirstEquipPet", "n_Value": "50002", "exception": ""}, {"s_ID": "n_PetReinforceMaterialID", "n_Value": "441", "exception": ""}, {"s_ID": "n_PetReinforcePriceOptionID1", "n_Value": "340001", "exception": ""}, {"s_ID": "n_PetReinforcePriceOptionID2", "n_Value": "340002", "exception": ""}, {"s_ID": "n_PetReinforcePriceOptionID3", "n_Value": "340003", "exception": ""}, {"s_ID": "n_PetSkillAwaken_Lv1", "n_Value": "10", "exception": ""}, {"s_ID": "n_PetSkillAwaken_Lv2", "n_Value": "20", "exception": ""}, {"s_ID": "n_PetSkillAwaken_Lv3", "n_Value": "40", "exception": ""}, {"s_ID": "n_AddPetGachaADMinute", "n_Value": "10", "exception": "펫 광고 시간 (분)"}, {"s_ID": "n_CostPerPetGacha", "n_Value": "100", "exception": "펫 1회당 뽑기 비용"}, {"s_ID": "n_EssenceMileageID", "n_Value": "471", "exception": ""}, {"s_ID": "n_EssenceRandomBagID", "n_Value": "9800001", "exception": ""}, {"s_ID": "n_RelicMaxStar", "n_Value": "5", "exception": ""}, {"s_ID": "n_RelicReinforceMaterialID", "n_Value": "472", "exception": ""}, {"s_ID": "n_FarmSeedID", "n_Value": "456", "exception": ""}, {"s_ID": "n_FarmPlantingSeedAmount", "n_Value": "5", "exception": ""}, {"s_ID": "n_FirstClassID", "n_Value": "10501", "exception": "최초 시작 직업"}, {"s_ID": "MazeMapCount", "n_Value": "2", "exception": "미궁 맵 개수"}, {"s_ID": "GoldDropRandomRange", "n_Value": "0.1", "exception": "몬스터 드랍 골드양 범위"}, {"s_ID": "n_Benefit1Count", "n_Value": "10", "exception": "뽑기 혜택1 횟수"}, {"s_ID": "n_Benefit2Count", "n_Value": "50", "exception": "뽑기 혜택2 횟수"}, {"s_ID": "n_Benefit1Grade", "n_Value": "4", "exception": "뽑기 혜택1 등급"}, {"s_ID": "n_Benefit2Grade", "n_Value": "5", "exception": "뽑기 혜택2 등급"}] \ No newline at end of file diff --git a/Assets/ResWork/Table/Server/server_GlobalValue.txt b/Assets/ResWork/Table/Server/server_GlobalValue.txt new file mode 100644 index 000000000..aa7ca8b34 --- /dev/null +++ b/Assets/ResWork/Table/Server/server_GlobalValue.txt @@ -0,0 +1,302 @@ +[ + { + "s_ID": "n_CashItemID", + "n_Value": "1" + }, + { + "s_ID": "n_JewelItemID", + "n_Value": "3" + }, + { + "s_ID": "ATK", + "n_Value": "1" + }, + { + "s_ID": "HP", + "n_Value": "100" + }, + { + "s_ID": "DEF", + "n_Value": "1" + }, + { + "s_ID": "M_DEF", + "n_Value": "1" + }, + { + "s_ID": "ATK_Multiplier", + "n_Value": "0" + }, + { + "s_ID": "HP_Multiplier", + "n_Value": "0" + }, + { + "s_ID": "DEF_Multiplier", + "n_Value": "0" + }, + { + "s_ID": "M_DEF_Multiplier", + "n_Value": "0" + }, + { + "s_ID": "MP", + "n_Value": "30" + }, + { + "s_ID": "MP_Multiplier", + "n_Value": "0" + }, + { + "s_ID": "ATK_FIXED", + "n_Value": "0" + }, + { + "s_ID": "ATK_FIXED_DECREASE", + "n_Value": "0" + }, + { + "s_ID": "CRI", + "n_Value": "0" + }, + { + "s_ID": "CRI_DMG_Multiplier", + "n_Value": "10" + }, + { + "s_ID": "M_CRI", + "n_Value": "100" + }, + { + "s_ID": "M_CRI_DMG_Multiplier", + "n_Value": "0.1" + }, + { + "s_ID": "SKILL_Multiplier", + "n_Value": "0" + }, + { + "s_ID": "COOLTIME_Multiplier", + "n_Value": "0" + }, + { + "s_ID": "HERO_ATK_SPD", + "n_Value": "0.75" + }, + { + "s_ID": "ATK_SPD_Multiplier", + "n_Value": "1" + }, + { + "s_ID": "HERO_MOVE_SPD", + "n_Value": "3" + }, + { + "s_ID": "MOVE_SPD_Multiplier", + "n_Value": "1" + }, + { + "s_ID": "HP_REGEN", + "n_Value": "1" + }, + { + "s_ID": "MP_REGEN", + "n_Value": "3" + }, + { + "s_ID": "HP_REGEN_Multiplier", + "n_Value": "0" + }, + { + "s_ID": "MP_REGEN_Multiplier", + "n_Value": "0" + }, + { + "s_ID": "PIERCING_Multiplier", + "n_Value": "0" + }, + { + "s_ID": "DMG_Multiplier", + "n_Value": "0" + }, + { + "s_ID": "GOLD_INCREASE", + "n_Value": "0" + }, + { + "s_ID": "GOLD_Multiplier", + "n_Value": "0" + }, + { + "s_ID": "EXP_Multiplier", + "n_Value": "0" + }, + { + "s_ID": "ITEM_Multiplier", + "n_Value": "0" + }, + { + "s_ID": "EnchantOpenLv1", + "n_Value": "0" + }, + { + "s_ID": "EnchantOpenLv2", + "n_Value": "10" + }, + { + "s_ID": "EnchantOpenLv3", + "n_Value": "20" + }, + { + "s_ID": "Defense_Coefficient", + "n_Value": "6" + }, + { + "s_ID": "f_PC_FindEnemyRange", + "n_Value": "6" + }, + { + "s_ID": "f_Pet_FindEnemyRange", + "n_Value": "5" + }, + { + "s_ID": "f_AvoidCoolTime", + "n_Value": "5" + }, + { + "s_ID": "f_KnockbackTime", + "n_Value": "0.02" + }, + { + "s_ID": "f_SkillTeamRange", + "n_Value": "15" + }, + { + "s_ID": "n_AbilityMaterialID", + "n_Value": "444" + }, + { + "s_ID": "n_JobMaterialID", + "n_Value": "445" + }, + { + "s_ID": "AWAKEN_GOODS_UPGRADE", + "n_Value": "450" + }, + { + "s_ID": "AWAKEN_GOODS_STR", + "n_Value": "451" + }, + { + "s_ID": "AWAKEN_GOODS_DEX", + "n_Value": "452" + }, + { + "s_ID": "AWAKEN_GOODS_INT", + "n_Value": "453" + }, + { + "s_ID": "AWAKEN_GOODS_LUK", + "n_Value": "454" + }, + { + "s_ID": "AWAKEN_GOODS_ALL", + "n_Value": "455" + }, + { + "s_ID": "n_BreakingLimitSlotMaterialID", + "n_Value": "461" + }, + { + "s_ID": "n_FirstEquipPet", + "n_Value": "50002" + }, + { + "s_ID": "n_PetReinforceMaterialID", + "n_Value": "441" + }, + { + "s_ID": "n_PetReinforcePriceOptionID1", + "n_Value": "340001" + }, + { + "s_ID": "n_PetReinforcePriceOptionID2", + "n_Value": "340002" + }, + { + "s_ID": "n_PetReinforcePriceOptionID3", + "n_Value": "340003" + }, + { + "s_ID": "n_PetSkillAwaken_Lv1", + "n_Value": "10" + }, + { + "s_ID": "n_PetSkillAwaken_Lv2", + "n_Value": "20" + }, + { + "s_ID": "n_PetSkillAwaken_Lv3", + "n_Value": "40" + }, + { + "s_ID": "n_AddPetGachaADMinute", + "n_Value": "10" + }, + { + "s_ID": "n_CostPerPetGacha", + "n_Value": "100" + }, + { + "s_ID": "n_EssenceMileageID", + "n_Value": "471" + }, + { + "s_ID": "n_EssenceRandomBagID", + "n_Value": "9800001" + }, + { + "s_ID": "n_RelicMaxStar", + "n_Value": "5" + }, + { + "s_ID": "n_RelicReinforceMaterialID", + "n_Value": "472" + }, + { + "s_ID": "n_FarmSeedID", + "n_Value": "456" + }, + { + "s_ID": "n_FarmPlantingSeedAmount", + "n_Value": "5" + }, + { + "s_ID": "n_FirstClassID", + "n_Value": "10501" + }, + { + "s_ID": "MazeMapCount", + "n_Value": "2" + }, + { + "s_ID": "GoldDropRandomRange", + "n_Value": "0.1" + }, + { + "s_ID": "n_Benefit1Count", + "n_Value": "10" + }, + { + "s_ID": "n_Benefit2Count", + "n_Value": "50" + }, + { + "s_ID": "n_Benefit1Grade", + "n_Value": "4" + }, + { + "s_ID": "n_Benefit2Grade", + "n_Value": "5" + } +] \ No newline at end of file diff --git a/Assets/ResWork/Table/Server/server_GlobalValue.txt.meta b/Assets/ResWork/Table/Server/server_GlobalValue.txt.meta new file mode 100644 index 000000000..6a6042030 --- /dev/null +++ b/Assets/ResWork/Table/Server/server_GlobalValue.txt.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 19c610b64ff45a843af2ef7823b4031c +TextScriptImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ResWork/Table/butler.xlsm b/Assets/ResWork/Table/butler.xlsm index c26227fec..48319c21f 100644 Binary files a/Assets/ResWork/Table/butler.xlsm and b/Assets/ResWork/Table/butler.xlsm differ diff --git a/Assets/Res_Addr/MainUI/NewGameUI.prefab b/Assets/Res_Addr/MainUI/NewGameUI.prefab index 8eeaff291..85ab86d31 100644 --- a/Assets/Res_Addr/MainUI/NewGameUI.prefab +++ b/Assets/Res_Addr/MainUI/NewGameUI.prefab @@ -3677,6 +3677,7 @@ RectTransform: m_Children: - {fileID: 1964217436849222645} - {fileID: 3606926360321084644} + - {fileID: 1190262876196744635} m_Father: {fileID: 7338987881700654041} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} @@ -8222,6 +8223,140 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!1 &659576051051030916 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5078925483849685378} + - component: {fileID: 5357417098150085361} + - component: {fileID: 5839956253746722031} + m_Layer: 5 + m_Name: New TMP + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5078925483849685378 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 659576051051030916} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 4790447586644318007} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 150, y: 30} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &5357417098150085361 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 659576051051030916} + m_CullTransparentMesh: 1 +--- !u!114 &5839956253746722031 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 659576051051030916} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 0 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_text: 10 + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: a387e325271126742ad15569dba1ac57, type: 2} + m_sharedMaterial: {fileID: 2100000, guid: 6d7cd7be388f7ca40a8ad4491be308b8, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 45 + m_fontSizeBase: 45 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 15 + m_fontSizeMax: 60 + m_fontStyle: 0 + m_HorizontalAlignment: 2 + m_VerticalAlignment: 4096 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 0 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} --- !u!1 &661406400593674527 GameObject: m_ObjectHideFlags: 0 @@ -17950,6 +18085,7 @@ RectTransform: m_Children: - {fileID: 7805590745271758539} - {fileID: 2214433395391961452} + - {fileID: 7941100343014335329} m_Father: {fileID: 7338987881700654041} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} @@ -35163,6 +35299,10 @@ MonoBehaviour: texts: - {fileID: 7596536048090067934} - {fileID: 1268175413322224835} + gacha_moneyForms: + - {fileID: 5942106110191347513} + - {fileID: 9134361195859800753} + - {fileID: 3343212417456610850} zSizeControler: {fileID: 8910885521100194526} --- !u!1 &2384631821971979131 GameObject: @@ -66305,6 +66445,140 @@ MonoBehaviour: m_hasFontAssetChanged: 0 m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!1 &4488553440267166316 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1190262876196744635} + - component: {fileID: 9184724837557847827} + - component: {fileID: 227584131248134180} + m_Layer: 5 + m_Name: New TMP + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1190262876196744635 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4488553440267166316} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 4822580574932031066} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 150, y: 30} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &9184724837557847827 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4488553440267166316} + m_CullTransparentMesh: 1 +--- !u!114 &227584131248134180 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4488553440267166316} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 0 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_text: 1 + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: a387e325271126742ad15569dba1ac57, type: 2} + m_sharedMaterial: {fileID: 2100000, guid: 6d7cd7be388f7ca40a8ad4491be308b8, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 45 + m_fontSizeBase: 45 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 15 + m_fontSizeMax: 60 + m_fontStyle: 0 + m_HorizontalAlignment: 2 + m_VerticalAlignment: 4096 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 0 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} --- !u!1 &4489080155073105196 GameObject: m_ObjectHideFlags: 0 @@ -114572,6 +114846,7 @@ RectTransform: m_Children: - {fileID: 1116860097070341305} - {fileID: 7109174512294731895} + - {fileID: 5078925483849685378} m_Father: {fileID: 7338987881700654041} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} @@ -120635,6 +120910,140 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_localtextKey: 310 +--- !u!1 &8517694912272464061 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7941100343014335329} + - component: {fileID: 9082827137350062916} + - component: {fileID: 6618924485026518513} + m_Layer: 5 + m_Name: New TMP + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7941100343014335329 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8517694912272464061} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 6704336861855336849} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 150, y: 30} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &9082827137350062916 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8517694912272464061} + m_CullTransparentMesh: 1 +--- !u!114 &6618924485026518513 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8517694912272464061} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 0 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_text: 1 + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: a387e325271126742ad15569dba1ac57, type: 2} + m_sharedMaterial: {fileID: 2100000, guid: 6d7cd7be388f7ca40a8ad4491be308b8, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 45 + m_fontSizeBase: 45 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 15 + m_fontSizeMax: 60 + m_fontStyle: 0 + m_HorizontalAlignment: 2 + m_VerticalAlignment: 4096 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 0 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} --- !u!1 &8519434912543987982 GameObject: m_ObjectHideFlags: 0 @@ -135835,6 +136244,18 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 150bed98d110cb24292c78f18534decd, type: 3} +--- !u!114 &3343212417456610850 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: -6408983573810322809, guid: 150bed98d110cb24292c78f18534decd, + type: 3} + m_PrefabInstance: {fileID: 678863348201553061} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: b055af6abeefd104995ea4fdfcd9b939, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!224 &7109174512294731895 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 7765070059004976338, guid: 150bed98d110cb24292c78f18534decd, @@ -154172,6 +154593,18 @@ RectTransform: type: 3} m_PrefabInstance: {fileID: 6470954107089522742} m_PrefabAsset: {fileID: 0} +--- !u!114 &9134361195859800753 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: -6408983573810322809, guid: 150bed98d110cb24292c78f18534decd, + type: 3} + m_PrefabInstance: {fileID: 6470954107089522742} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: b055af6abeefd104995ea4fdfcd9b939, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1001 &6539677606557866811 PrefabInstance: m_ObjectHideFlags: 0 @@ -158918,6 +159351,10 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 6704336861855336849} m_Modifications: + - target: {fileID: 2913569658229331, guid: 150bed98d110cb24292c78f18534decd, type: 3} + propertyPath: m_AnchoredPosition.x + value: 44 + objectReference: {fileID: 0} - target: {fileID: 2149388479339114956, guid: 150bed98d110cb24292c78f18534decd, type: 3} propertyPath: m_Sprite @@ -158932,7 +159369,7 @@ PrefabInstance: - target: {fileID: 4481596846596989744, guid: 150bed98d110cb24292c78f18534decd, type: 3} propertyPath: m_text - value: 0 + value: 00:00 objectReference: {fileID: 0} - target: {fileID: 4481596846596989744, guid: 150bed98d110cb24292c78f18534decd, type: 3} @@ -158954,6 +159391,11 @@ PrefabInstance: propertyPath: m_fontColor32.rgba value: 4278190080 objectReference: {fileID: 0} + - target: {fileID: 4481596846596989744, guid: 150bed98d110cb24292c78f18534decd, + type: 3} + propertyPath: m_HorizontalAlignment + value: 2 + objectReference: {fileID: 0} - target: {fileID: 6864738522005250112, guid: 150bed98d110cb24292c78f18534decd, type: 3} propertyPath: m_SizeDelta.x @@ -159091,6 +159533,18 @@ RectTransform: type: 3} m_PrefabInstance: {fileID: 8464565403339376062} m_PrefabAsset: {fileID: 0} +--- !u!114 &5942106110191347513 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: -6408983573810322809, guid: 150bed98d110cb24292c78f18534decd, + type: 3} + m_PrefabInstance: {fileID: 8464565403339376062} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: b055af6abeefd104995ea4fdfcd9b939, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1001 &8482846374899426304 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/Assets/Script/Server/ServerClass.cs b/Assets/Script/Server/ServerClass.cs index cafebf416..1d0baee5d 100644 --- a/Assets/Script/Server/ServerClass.cs +++ b/Assets/Script/Server/ServerClass.cs @@ -72,6 +72,7 @@ public partial class ServerData /// { ID, 0 갯수, 1 레벨 } /// public Dictionary> Pet = new Dictionary>(); + public DateTime PetGachaADTime; /// /// { ID, 0 갯수, 1 레벨, 2 별 } /// @@ -215,6 +216,7 @@ public partial class ServerData temp.LimitSlot[item.Key].Add(item.Value[i].Get()); } temp.Pet = DSUtil.Get_T_Dic(Pet); + temp.PetGachaADTime = PetGachaADTime; temp.Relic = DSUtil.Get_T_Dic(Relic); temp.Collection = DSUtil.Get_T_Dic(Collection); temp.MobKill = DSUtil.Get_T_Dic(MobKill); @@ -265,6 +267,7 @@ public class ServerData_Read public Dictionary Awaken; public Dictionary> LimitSlot; public Dictionary> Pet, Relic, Dungeon, Gacha; + public DateTime PetGachaADTime; public Dictionary Collection; public Dictionary MobKill; public SD_Farm_Read Farm; @@ -315,6 +318,7 @@ public class ServerData_Read temp.LimitSlot[item.Key].Add(item.Value[i].Get()); } temp.Pet = DSUtil.Get_T_Dic(Pet); + temp.PetGachaADTime = PetGachaADTime; temp.Relic = DSUtil.Get_T_Dic(Relic); temp.Collection = DSUtil.Get_T_Dic(Collection); temp.MobKill = DSUtil.Get_T_Dic(MobKill); @@ -762,6 +766,10 @@ public partial class ServerData Pet[key][1].RandomizeCryptoKey(); } } + public TimeSpan Get_PetGachaADTime() + { + return PetGachaADTime - ServerInfo.ServerTime; + } #endregion #region 유물 public int Get_RelicLv(int id) diff --git a/Assets/Script/UI/Pet/PetUI_Left.cs b/Assets/Script/UI/Pet/PetUI_Left.cs index 8e5d44d3c..38822ccd6 100644 --- a/Assets/Script/UI/Pet/PetUI_Left.cs +++ b/Assets/Script/UI/Pet/PetUI_Left.cs @@ -1,3 +1,4 @@ +using CodeStage.AntiCheat.ObscuredTypes; using System.Collections.Generic; using TMPro; using UnityEngine; @@ -10,6 +11,7 @@ public class PetUI_Left : UI3DModel public SkillCard[] skillCards; // 0 액티브 스킬, 1 패시브 스킬 public Image[] images; // 0 등급 public TextMeshProUGUI[] texts; // 0 펫 이름, 1 등급 + public MoneyForm[] gacha_moneyForms; // 0 광고(시간), 1 1회 뽑기, 2 10회 뽑기 public zSizeControler zSizeControler; @@ -21,6 +23,11 @@ public class PetUI_Left : UI3DModel skillCards[i].Set_CardType(eUICardType.UIPetSkill); } + private void Update() + { + Set_GambleADTimeText(); + } + public void Set(PetListTableData data) { var sdata = ServerInfo.Ins.m_ServerData; @@ -38,6 +45,23 @@ public class PetUI_Left : UI3DModel var lv = sdata.Get_PetLv(m_Data.n_PetID); skillCards[0].Set_PetSkill(m_Data.n_PetActiveSkill, data.n_PetID, lv); skillCards[1].Set_PetSkill(m_Data.n_PetPassiveSkill, data.n_PetID, lv); + + Set_GambleUI(); + } + + void Set_GambleUI() + { + Set_GambleADTimeText(); + + var sdata = ServerInfo.Ins.m_ServerData; + gacha_moneyForms[1].amount.text = DSUtil.GetThousandCommaText(1 * table_GlobalValue.Ins.Get_Int("n_CostPerPetGacha")); + gacha_moneyForms[2].amount.text = DSUtil.GetThousandCommaText(10 * table_GlobalValue.Ins.Get_Int("n_CostPerPetGacha")); + } + void Set_GambleADTimeText() + { + var sdata = ServerInfo.Ins.m_ServerData; + var ts = sdata.Get_PetGachaADTime(); + gacha_moneyForms[0].amount.text = ts.TotalSeconds <= 0 ? "00:00" : DSUtil.Get_TimeText_MS(ts); } void Set_PurStat() @@ -60,24 +84,45 @@ public class PetUI_Left : UI3DModel m_PetInfoDetailUI.Set(m_Data); } + ObscuredInt m_Amount, m_Price; public void OnClick_Gamble(int index) { - int amount = 1; + var sdata = ServerInfo.Ins.m_ServerData; + + m_Amount = 1; + m_Price = 0; switch (index) { case 0: // 광고 뽑기 + var ts = sdata.Get_PetGachaADTime(); + if (ts.TotalSeconds > 0) return; + sdata.PetGachaADTime = ServerInfo.ServerTime.AddMinutes(table_GlobalValue.Ins.Get_Int("n_AddPetGachaADMinute")); break; case 1: // 뽑기1 + m_Price = m_Amount * table_GlobalValue.Ins.Get_Int("n_CostPerPetGacha"); break; case 2: // 뽑기2 - amount = 10; + m_Amount = 10; + m_Price = m_Amount * table_GlobalValue.Ins.Get_Int("n_CostPerPetGacha"); break; } + m_Amount.RandomizeCryptoKey(); + m_Price.RandomizeCryptoKey(); + if (index == 0) + ADInfo.Ins.Show_AD(Send_Gamble); + else if (sdata.Check_ItemAmount(1, m_Price)) + Send_Gamble(); + } + + void Send_Gamble() + { var sdata = ServerInfo.Ins.m_ServerData; + if (m_Price > 0) sdata.Use_Item(1, m_Price); + var itemlst = new List(); var petlst = table_petlist.Ins.Get_DataList(); - for (int i = 0; i < amount; i++) + for (int i = 0; i < m_Amount; i++) { var temp = new ItemSimpleData(); temp.itemid = petlst[Random.Range(0, petlst.Count)].n_PetID; @@ -86,14 +131,12 @@ public class PetUI_Left : UI3DModel sdata.Add_Item(temp.itemid, 1); } - sdata.Add_MissionCount(ePurpose.GACHA_PET, 0, amount); - sdata.Add_MissionCount(ePurpose.GACHA_PET_ACC, 0, amount); - sdata.Add_MissionCount(ePurpose.GACHA_ALL, 0, amount); + sdata.Add_MissionCount(ePurpose.GACHA_PET, 0, m_Amount); + sdata.Add_MissionCount(ePurpose.GACHA_PET_ACC, 0, m_Amount); + sdata.Add_MissionCount(ePurpose.GACHA_ALL, 0, m_Amount); - ServerInfo.Ins.Write(() => - { - ObtainItemUI.Ins.Set(itemlst); - NewGameUI.Ins.m_PetUI.m_PetUI_Right.Set_Scroll(); - }); + ObtainItemUI.Ins.Set(itemlst); + NewGameUI.Ins.m_PetUI.m_PetUI_Right.Set_Scroll(); + Set_GambleUI(); } } \ No newline at end of file diff --git a/Assets/Script/Util/MyEnum.cs b/Assets/Script/Util/MyEnum.cs index 2063c7fcd..c991632e4 100644 --- a/Assets/Script/Util/MyEnum.cs +++ b/Assets/Script/Util/MyEnum.cs @@ -196,7 +196,7 @@ public enum eStat public enum eFarmerStat { MoveSpeed, DanceCoolTime } public enum eCommon { - Agree, Noti, NightNoti, DOY_Day, DOY_Week, DOY_Month, PlayTime, Auto, FirstStatInit, ADRemove, GuideStep, GuideCount, + Agree, Noti, NightNoti, DOY_Day, DOY_Week, DOY_Month, PlayTime, Auto, FirstStatInit, ADRemove, GuideStep, GuideCount, 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,