diff --git a/Assets/PlayFabEditorExtensions/Editor/Resources/.CloudScript.js b/Assets/PlayFabEditorExtensions/Editor/Resources/.CloudScript.js index 2b026080f..27e0a5668 100644 --- a/Assets/PlayFabEditorExtensions/Editor/Resources/.CloudScript.js +++ b/Assets/PlayFabEditorExtensions/Editor/Resources/.CloudScript.js @@ -1448,7 +1448,7 @@ handlers.Save_Pet_Gacha = function(args) } var table = Get_MissionTable(); - var price = amount * Get_GlobalValue_nValue("n_CostPerPetGacha"); + var price = args.AD ? 0 : amount * Get_GlobalValue_nValue("n_CostPerPetGacha"); if (args.AD || Use_Item(table, urod, 1, price)) { var itemtable = Get_ItemTable(); diff --git a/Assets/Res_Addr/MainUI/NewGameUI.prefab b/Assets/Res_Addr/MainUI/NewGameUI.prefab index 85ab86d31..ddfbef668 100644 --- a/Assets/Res_Addr/MainUI/NewGameUI.prefab +++ b/Assets/Res_Addr/MainUI/NewGameUI.prefab @@ -35299,6 +35299,9 @@ MonoBehaviour: texts: - {fileID: 7596536048090067934} - {fileID: 1268175413322224835} + - {fileID: 4231650231693638215} + - {fileID: 8875133016581644590} + slider_gacha: {fileID: 6911681460856292501} gacha_moneyForms: - {fileID: 5942106110191347513} - {fileID: 9134361195859800753} diff --git a/Assets/Resources/PlayFabSharedSettings.asset b/Assets/Resources/PlayFabSharedSettings.asset index d6c1df3b1..e8b883388 100644 --- a/Assets/Resources/PlayFabSharedSettings.asset +++ b/Assets/Resources/PlayFabSharedSettings.asset @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 093286084a3d1994a9c28281a1c38b1d, type: 3} m_Name: PlayFabSharedSettings m_EditorClassIdentifier: - TitleId: D1149 + TitleId: CD90A DeveloperSecretKey: WH5F5UFQ9YRS538YJJHQCFIUEZTF5JSD36IJQKZ3Z99G7WDNES ProductionEnvironmentUrl: RequestType: 2 diff --git a/Assets/Script/UI/Pet/PetUI.cs b/Assets/Script/UI/Pet/PetUI.cs index 940bed470..e69ea03e4 100644 --- a/Assets/Script/UI/Pet/PetUI.cs +++ b/Assets/Script/UI/Pet/PetUI.cs @@ -9,5 +9,7 @@ public class PetUI : BotMenuBase { base.Set(); m_PetUI_Right.Set(); // left 포함 + + Set_Money(1, 441); } } \ No newline at end of file diff --git a/Assets/Script/UI/Pet/PetUI_Left.cs b/Assets/Script/UI/Pet/PetUI_Left.cs index d6b264f1c..cf99b5ca6 100644 --- a/Assets/Script/UI/Pet/PetUI_Left.cs +++ b/Assets/Script/UI/Pet/PetUI_Left.cs @@ -10,7 +10,8 @@ public class PetUI_Left : UI3DModel public PetPureStatCard[] arr_statcard; public SkillCard[] skillCards; // 0 액티브 스킬, 1 패시브 스킬 public Image[] images; // 0 등급 - public TextMeshProUGUI[] texts; // 0 펫 이름, 1 등급 + public TextMeshProUGUI[] texts; // 0 펫 이름, 1 등급, 2 가챠 레벨, 3 가챠 진행상황 + public Slider slider_gacha; public MoneyForm[] gacha_moneyForms; // 0 광고(시간), 1 1회 뽑기, 2 10회 뽑기 public zSizeControler zSizeControler; @@ -54,6 +55,10 @@ public class PetUI_Left : UI3DModel Set_GambleADTimeText(); var sdata = ServerInfo.Ins.m_ServerData; + texts[2].text = DSUtil.Format("Lv.{0}", sdata.PetData.GachaLv); + texts[3].text = DSUtil.Format("{0}/{1}", sdata.PetData.GachaExp, "???"); + slider_gacha.value = sdata.PetData.GachaExp / 1; + 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")); } @@ -109,12 +114,11 @@ public class PetUI_Left : UI3DModel m_Price.RandomizeCryptoKey(); if (index == 0) - //ADInfo.Ins.Show_AD(() => - //{ - // sdata.PetData.PetGachaADTime = ServerInfo.ServerTime.AddMinutes(table_GlobalValue.Ins.Get_Int("n_AddPetGachaADMinute")); - // Send_Gamble(); - //}); - Send_Gamble(); + ADInfo.Ins.Show_AD(() => + { + sdata.PetData.PetGachaADTime = ServerInfo.ServerTime.AddMinutes(table_GlobalValue.Ins.Get_Int("n_AddPetGachaADMinute")); + Send_Gamble(); + }); else if (sdata.Check_ItemAmount(1, m_Price)) Send_Gamble(); }