diff --git a/Assets/ResWork/Table/Export/GachaConfig.json b/Assets/ResWork/Table/Export/GachaConfig.json index 8d7435332..ff15c751e 100644 --- a/Assets/ResWork/Table/Export/GachaConfig.json +++ b/Assets/ResWork/Table/Export/GachaConfig.json @@ -1 +1 @@ -[{"n_ID": "10001", "n_Title": "290", "s_Banner": "2", "n_GachaPrice": "250", "n_GachaGoodsID": "1", "n_NormalRandombag": "30001", "n_Extra10_Randombag": "40001", "n_Extra50_Randombag": "50001", "n_PickupReward": "20001"}, {"n_ID": "10002", "n_Title": "292", "s_Banner": "3", "n_GachaPrice": "750", "n_GachaGoodsID": "1", "n_NormalRandombag": "30002", "n_Extra10_Randombag": "40002", "n_Extra50_Randombag": "50002", "n_PickupReward": "20002"}, {"n_ID": "10003", "n_Title": "293", "s_Banner": "4", "n_GachaPrice": "2500", "n_GachaGoodsID": "1", "n_NormalRandombag": "30003", "n_Extra10_Randombag": "40003", "n_Extra50_Randombag": "50003", "n_PickupReward": "20003"}, {"n_ID": "10004", "n_Title": "209", "s_Banner": "5", "n_GachaPrice": "5000", "n_GachaGoodsID": "1", "n_NormalRandombag": "30004", "n_Extra10_Randombag": "40004", "n_Extra50_Randombag": "50004", "n_PickupReward": "20004"}] \ No newline at end of file +[{"n_ID": "10001", "n_Title": "290", "s_Banner": "", "n_GachaPrice": "500", "n_GachaGoodsID": "1", "n_NormalRandombag": "30001", "n_Extra10_Randombag": "40001", "n_Extra50_Randombag": "50001", "n_PickupReward": "20001"}, {"n_ID": "10002", "n_Title": "292", "s_Banner": "", "n_GachaPrice": "500", "n_GachaGoodsID": "1", "n_NormalRandombag": "30002", "n_Extra10_Randombag": "40002", "n_Extra50_Randombag": "50002", "n_PickupReward": "20002"}, {"n_ID": "10003", "n_Title": "293", "s_Banner": "", "n_GachaPrice": "500", "n_GachaGoodsID": "1", "n_NormalRandombag": "30003", "n_Extra10_Randombag": "40003", "n_Extra50_Randombag": "50003", "n_PickupReward": "20003"}, {"n_ID": "10004", "n_Title": "209", "s_Banner": "", "n_GachaPrice": "1000", "n_GachaGoodsID": "1", "n_NormalRandombag": "30004", "n_Extra10_Randombag": "40004", "n_Extra50_Randombag": "50004", "n_PickupReward": "20004"}] \ No newline at end of file diff --git a/Assets/ResWork/Table/Export/GachaRateTable.json b/Assets/ResWork/Table/Export/GachaRateTable.json new file mode 100644 index 000000000..d86af7b7f --- /dev/null +++ b/Assets/ResWork/Table/Export/GachaRateTable.json @@ -0,0 +1 @@ +[{"n_ID": "10001", "n_GachaLevel": "1", "n_Grade1": "3000000", "n_Grade2": "250000", "n_Grade3": "200000", "n_Grade4": "150000", "n_Grade5": "50000", "n_Grade6": "40000", "n_Grade7": "10000", "n_Grade8": "0", "n_Grade9": "0"}, {"n_ID": "10001", "n_GachaLevel": "2", "n_Grade1": "3000000", "n_Grade2": "200000", "n_Grade3": "250000", "n_Grade4": "100000", "n_Grade5": "100000", "n_Grade6": "40000", "n_Grade7": "10000", "n_Grade8": "0", "n_Grade9": "0"}, {"n_ID": "10002", "n_GachaLevel": "1", "n_Grade1": "4000000", "n_Grade2": "250000", "n_Grade3": "200000", "n_Grade4": "150000", "n_Grade5": "50000", "n_Grade6": "40000", "n_Grade7": "10000", "n_Grade8": "0", "n_Grade9": "0"}, {"n_ID": "10002", "n_GachaLevel": "2", "n_Grade1": "4000000", "n_Grade2": "200000", "n_Grade3": "250000", "n_Grade4": "100000", "n_Grade5": "100000", "n_Grade6": "40000", "n_Grade7": "10000", "n_Grade8": "0", "n_Grade9": "0"}, {"n_ID": "10003", "n_GachaLevel": "1", "n_Grade1": "4000000", "n_Grade2": "250000", "n_Grade3": "200000", "n_Grade4": "150000", "n_Grade5": "50000", "n_Grade6": "40000", "n_Grade7": "10000", "n_Grade8": "0", "n_Grade9": "0"}, {"n_ID": "10003", "n_GachaLevel": "2", "n_Grade1": "4000000", "n_Grade2": "200000", "n_Grade3": "250000", "n_Grade4": "100000", "n_Grade5": "100000", "n_Grade6": "40000", "n_Grade7": "10000", "n_Grade8": "0", "n_Grade9": "0"}, {"n_ID": "10004", "n_GachaLevel": "1", "n_Grade1": "3000000", "n_Grade2": "250000", "n_Grade3": "200000", "n_Grade4": "150000", "n_Grade5": "50000", "n_Grade6": "40000", "n_Grade7": "10000", "n_Grade8": "0", "n_Grade9": "0"}] \ No newline at end of file diff --git a/Assets/ResWork/Table/Export/GachaRateTable.json.meta b/Assets/ResWork/Table/Export/GachaRateTable.json.meta new file mode 100644 index 000000000..b9b979548 --- /dev/null +++ b/Assets/ResWork/Table/Export/GachaRateTable.json.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: dbebb73bbeb46ba4fb9b288a10b00ba0 +TextScriptImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ResWork/Table/Export/GlobalValue.json b/Assets/ResWork/Table/Export/GlobalValue.json index 1b7e30dd2..f804378b5 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": "sss"}, {"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_GachaTicketID", "n_Value": "401", "exception": "뽑기권 아이템 id"}] \ No newline at end of file diff --git a/Assets/ResWork/Table/butler.xlsm b/Assets/ResWork/Table/butler.xlsm index de3d2b274..e547c2495 100644 Binary files a/Assets/ResWork/Table/butler.xlsm and b/Assets/ResWork/Table/butler.xlsm differ diff --git a/Assets/ResWork/UIPrefabs/Title/Tables.prefab b/Assets/ResWork/UIPrefabs/Title/Tables.prefab index bf1621e03..c80e365ff 100644 --- a/Assets/ResWork/UIPrefabs/Title/Tables.prefab +++ b/Assets/ResWork/UIPrefabs/Title/Tables.prefab @@ -71,6 +71,7 @@ GameObject: - component: {fileID: 7536875836770088219} - component: {fileID: 5575382242414862395} - component: {fileID: 491739550810814342} + - component: {fileID: 8426369912554284191} m_Layer: 0 m_Name: Tables m_TagString: Untagged @@ -906,3 +907,16 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_json: {fileID: 4900000, guid: 78ef5e6f20333d14c9678420ff61020f, type: 3} +--- !u!114 &8426369912554284191 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5043163894663193716} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 930ca4f26535b434bbf39af96654f521, type: 3} + m_Name: + m_EditorClassIdentifier: + m_json: {fileID: 4900000, guid: dbebb73bbeb46ba4fb9b288a10b00ba0, type: 3} diff --git a/Assets/Script/Table/Gacha/table_gacharate.cs b/Assets/Script/Table/Gacha/table_gacharate.cs new file mode 100644 index 000000000..53a459ec0 --- /dev/null +++ b/Assets/Script/Table/Gacha/table_gacharate.cs @@ -0,0 +1,111 @@ +using System; +using System.Collections.Generic; +using CodeStage.AntiCheat.ObscuredTypes; +using Newtonsoft.Json; + +[Serializable] +public class GachaRateTableData : TableDataBase +{ + protected ObscuredInt _ID; + public int n_ID + { + get { return _ID; } + set { _ID = value; _ID.RandomizeCryptoKey(); } + } + + protected ObscuredInt _GachaLevel; + public int n_GachaLevel + { + get { return _GachaLevel; } + set { _GachaLevel = value; _GachaLevel.RandomizeCryptoKey(); } + } + + protected ObscuredInt _Grade1; + public int n_Grade1 + { + get { return _Grade1; } + set { _Grade1 = value; _Grade1.RandomizeCryptoKey(); } + } + + protected ObscuredInt _Grade2; + public int n_Grade2 + { + get { return _Grade2; } + set { _Grade2 = value; _Grade2.RandomizeCryptoKey(); } + } + + protected ObscuredInt _Grade3; + public int n_Grade3 + { + get { return _Grade3; } + set { _Grade3 = value; _Grade3.RandomizeCryptoKey(); } + } + + protected ObscuredInt _Grade4; + public int n_Grade4 + { + get { return _Grade4; } + set { _Grade4 = value; _Grade4.RandomizeCryptoKey(); } + } + + protected ObscuredInt _Grade5; + public int n_Grade5 + { + get { return _Grade5; } + set { _Grade5 = value; _Grade5.RandomizeCryptoKey(); } + } + + protected ObscuredInt _Grade6; + public int n_Grade6 + { + get { return _Grade6; } + set { _Grade6 = value; _Grade6.RandomizeCryptoKey(); } + } + + protected ObscuredInt _Grade7; + public int n_Grade7 + { + get { return _Grade7; } + set { _Grade7 = value; _Grade7.RandomizeCryptoKey(); } + } + + protected ObscuredInt _Grade8; + public int n_Grade8 + { + get { return _Grade8; } + set { _Grade8 = value; _Grade8.RandomizeCryptoKey(); } + } + + protected ObscuredInt _Grade9; + public int n_Grade9 + { + get { return _Grade9; } + set { _Grade9 = value; _Grade9.RandomizeCryptoKey(); } + } +} + +public class table_gacharate : table_missionbase +{ + public static table_gacharate Ins; + List tableDatas; + + protected override void Awake() + { + base.Awake(); + Ins = this; + } + + protected override void Start() + { + tableDatas = JsonConvert.DeserializeObject>(json_last); + for (int i = 0; i < Get_DataList().Count; i++) + { + var temp = Get_DataList()[i]; + } + + base.Start(); + } + + //public GachaRateTableData Get_Data_orNull(int id) { return dic_Data.ContainsKey(id) ? dic_Data[id] : null; } + public List Get_DataList() { return tableDatas; } +} \ No newline at end of file diff --git a/Assets/Script/Table/Gacha/table_gacharate.cs.meta b/Assets/Script/Table/Gacha/table_gacharate.cs.meta new file mode 100644 index 000000000..7ceb6c5f5 --- /dev/null +++ b/Assets/Script/Table/Gacha/table_gacharate.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 930ca4f26535b434bbf39af96654f521 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Script/UI/Gacha/GachaBase.cs b/Assets/Script/UI/Gacha/GachaBase.cs index 7d5215a26..642818d6f 100644 --- a/Assets/Script/UI/Gacha/GachaBase.cs +++ b/Assets/Script/UI/Gacha/GachaBase.cs @@ -6,11 +6,18 @@ public class GachaBase : MonoBehaviour public TextMeshProUGUI[] texts; // 0 진행율, 1 등급장비1, 등급장비2 public MoneyForm[] moneyForms; // 0 10회1, 1 10회2, 2 1회 + GachaConfigTableData m_Data; + public virtual void Set(int gacha) { gameObject.SetActive(true); texts[1].text = DSUtil.Format(380, 0, MyText.Get_GradeName(4)); texts[2].text = DSUtil.Format(380, 0, MyText.Get_GradeName(5)); + + m_Data = table_gachaconfig.Ins.Get_Data_orNull(gacha); + moneyForms[0].Set(m_Data.n_GachaGoodsID, m_Data.n_GachaPrice * 10); + moneyForms[1].Set(table_GlobalValue.Ins.Get_Int("n_GachaTicketID"), 10); + moneyForms[2].Set(table_GlobalValue.Ins.Get_Int("n_GachaTicketID"), 1); } public void OnClick_Gacha(int count) diff --git a/Assets/Script/UI/Gacha/GachaUI.cs b/Assets/Script/UI/Gacha/GachaUI.cs index b59025f03..d01470383 100644 --- a/Assets/Script/UI/Gacha/GachaUI.cs +++ b/Assets/Script/UI/Gacha/GachaUI.cs @@ -22,7 +22,7 @@ public class GachaUI : BotMenuBase } m_Tab.Set(list_tabData); OnClick_Tab(); - Set_Money(1, 401); + Set_Money(table_GlobalValue.Ins.Get_Int("n_CashItemID"), table_GlobalValue.Ins.Get_Int("n_GachaTicketID")); } private void OnClick_Tab()