diff --git a/Assets/Ino_nerdnavis.txt b/Assets/Ino_nerdnavis.txt index cd5a518e2..ae531528e 100644 --- a/Assets/Ino_nerdnavis.txt +++ b/Assets/Ino_nerdnavis.txt @@ -91,8 +91,3 @@ messageinfo 엄청 느린 버그 - 무기, 방어구, 장신구, 스킬 - 장비뽑기는 챕터에 따라 레벨 증가, 스킬 x - 장비(100회), 스킬(200회) 마다 설정된 장비 중 하나 선택해서 획득 - - -- 혜택 - - 50회마다 전설 등급 확정 - - 10회마다 영웅 등급 확정 - -- 서버 데이터 및 뽑기 diff --git a/Assets/ResWork/Table/Export/GlobalValue.json b/Assets/ResWork/Table/Export/GlobalValue.json index a37d2f2ee..fb0d21867 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": "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.1", "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": "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": "몬스터 드랍 골드양 범위"}] \ No newline at end of file +[{"s_ID": "n_CashItemID", "n_Value": "1", "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.1", "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": "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_GachaRewardPoint", "n_Value": "100", "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/butler.xlsm b/Assets/ResWork/Table/butler.xlsm index d82386990..1413125bd 100644 Binary files a/Assets/ResWork/Table/butler.xlsm and b/Assets/ResWork/Table/butler.xlsm differ diff --git a/Assets/Script/UI/Gacha/GachaBase.cs b/Assets/Script/UI/Gacha/GachaBase.cs index 08d60d871..687d731b9 100644 --- a/Assets/Script/UI/Gacha/GachaBase.cs +++ b/Assets/Script/UI/Gacha/GachaBase.cs @@ -1,16 +1,9 @@ -using CodeStage.AntiCheat.ObscuredTypes; using TMPro; using UnityEngine; using UnityEngine.UI; public class GachaBase : MonoBehaviour { - public static ObscuredInt SelectCount = 100; - public static ObscuredInt benefit1Count = 10; - public static ObscuredInt benefit2Count = 50; - public static ObscuredInt benefit1Grade = 4; - public static ObscuredInt benefit2Grade = 5; - public TextMeshProUGUI[] texts; // 0 진행율, 1 혜택1, 2 혜택2 public btn_gacha[] gacha_btns; // 0 10회, 1 1회 public Slider m_slider; @@ -30,6 +23,11 @@ public class GachaBase : MonoBehaviour gacha_btns[1].Set(1, m_Data); var sdata = ServerInfo.Ins.m_ServerData; + var SelectCount = table_GlobalValue.Ins.Get_Int("n_GachaRewardPoint"); + var benefit1Count = table_GlobalValue.Ins.Get_Int("n_Benefit1Count"); + var benefit2Count = table_GlobalValue.Ins.Get_Int("n_Benefit2Count"); + var benefit1Grade = table_GlobalValue.Ins.Get_Int("n_Benefit1Grade"); + var benefit2Grade = table_GlobalValue.Ins.Get_Int("n_Benefit2Grade"); texts[0].text = DSUtil.Format("{0}/{1}", sdata.Get_GachaPoint(m_Data.n_ID), SelectCount); m_slider.value = sdata.Get_GachaPoint(m_Data.n_ID) / (float)SelectCount; texts[1].text = DSUtil.Format(380, benefit1Count - sdata.Get_GachaCount(m_Data.n_ID) % benefit1Count, diff --git a/Assets/Script/UI/Gacha/btn_gacha.cs b/Assets/Script/UI/Gacha/btn_gacha.cs index 23639ec4d..85a4178c9 100644 --- a/Assets/Script/UI/Gacha/btn_gacha.cs +++ b/Assets/Script/UI/Gacha/btn_gacha.cs @@ -94,6 +94,10 @@ public class btn_gacha : MonoBehaviour var rateData = table_gacharate.Ins.Get_Data(m_Data.n_ID, m_Data.b_StageLv ? sdata.MapData_Get_MaxChapter() : 1); List items = new List(); List grades = new List(); + var benefit1Count = table_GlobalValue.Ins.Get_Int("n_Benefit1Count"); + var benefit2Count = table_GlobalValue.Ins.Get_Int("n_Benefit2Count"); + var benefit1Grade = table_GlobalValue.Ins.Get_Int("n_Benefit1Grade"); + var benefit2Grade = table_GlobalValue.Ins.Get_Int("n_Benefit2Grade"); var benefit1 = false; var benefit2 = false; for (int i = 0; i < m_Count; i++) @@ -105,8 +109,8 @@ public class btn_gacha : MonoBehaviour sdata.Add_Gacha(m_Data.n_ID, 1); var gachaCount = sdata.Get_GachaCount(m_Data.n_ID); - if (!benefit1 && gachaCount >= GachaBase.benefit1Count && gachaCount % GachaBase.benefit1Count == 0) benefit1 = true; - if (!benefit2 && gachaCount >= GachaBase.benefit2Count && gachaCount % GachaBase.benefit2Count == 0) benefit2 = true; + if (!benefit1 && gachaCount >= benefit1Count && gachaCount % benefit1Count == 0) benefit1 = true; + if (!benefit2 && gachaCount >= benefit2Count && gachaCount % benefit2Count == 0) benefit2 = true; } // gachacount 가 10일 때마다 4등급 아이템 하나가 포함되어야 함 @@ -115,7 +119,7 @@ public class btn_gacha : MonoBehaviour bool existgrade1 = false; for (int i = 0; i < grades.Count; i++) { - if (!existgrade1 && grades[i] == GachaBase.benefit1Grade) + if (!existgrade1 && grades[i] == benefit1Grade) existgrade1 = true; } @@ -123,9 +127,9 @@ public class btn_gacha : MonoBehaviour { for (int i = grades.Count - 1; i > 0 ; i--) { - if (grades[i] < GachaBase.benefit1Grade) + if (grades[i] < benefit1Grade) { - items[i] = table_gacharandombag.Ins.Get_RandomItemData(m_Data.dic_randomgbag[m_Count], GachaBase.benefit1Grade); + items[i] = table_gacharandombag.Ins.Get_RandomItemData(m_Data.dic_randomgbag[m_Count], benefit1Grade); break; } } @@ -138,7 +142,7 @@ public class btn_gacha : MonoBehaviour bool existgrade2 = false; for (int i = 0; i < grades.Count; i++) { - if (!existgrade2 && grades[i] == GachaBase.benefit2Grade) + if (!existgrade2 && grades[i] == benefit2Grade) existgrade2 = true; } @@ -146,9 +150,9 @@ public class btn_gacha : MonoBehaviour { for (int i = grades.Count - 1; i >= 0; i--) { - if (grades[i] < GachaBase.benefit2Grade) + if (grades[i] < benefit2Grade) { - items[i] = table_gacharandombag.Ins.Get_RandomItemData(m_Data.dic_randomgbag[m_Count], GachaBase.benefit2Grade); + items[i] = table_gacharandombag.Ins.Get_RandomItemData(m_Data.dic_randomgbag[m_Count], benefit2Grade); break; } }