From 087cd3c0e5758d496888e04b45d12cdb7338532c Mon Sep 17 00:00:00 2001 From: Ino Date: Tue, 1 Jul 2025 15:06:07 +0900 Subject: [PATCH] =?UTF-8?q?=EC=84=9C=EB=B2=84=20=ED=8A=B9=EC=84=B1=20?= =?UTF-8?q?=EA=B0=95=ED=99=94=20=EC=A1=B0=EA=B1=B4=20=EC=B6=94=EA=B0=80,?= =?UTF-8?q?=20ui=20=EA=B0=B1=EC=8B=A0=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Editor/Resources/.CloudScript.js | 14 ++++++++++++++ Assets/Script/Server/ServerInfo.cs | 1 + Assets/Script/UI/PC/Ability/PCAbilityCard.cs | 5 +++++ Assets/Script/UI/PC/Ability/PCAbilityCards.cs | 3 +++ Assets/Script/UI/PC/Ability/PCAbilityUI.cs | 2 +- .../Script/UI/PC/Ability/PCAbilityUI_Scrollview.cs | 2 +- 6 files changed, 25 insertions(+), 2 deletions(-) diff --git a/Assets/PlayFabEditorExtensions/Editor/Resources/.CloudScript.js b/Assets/PlayFabEditorExtensions/Editor/Resources/.CloudScript.js index bee68a24c..d88e847aa 100644 --- a/Assets/PlayFabEditorExtensions/Editor/Resources/.CloudScript.js +++ b/Assets/PlayFabEditorExtensions/Editor/Resources/.CloudScript.js @@ -623,6 +623,20 @@ handlers.Save_PC_Ability = function(args) if (data.n_MaxUpgradeLevel <= (urod.Ability[args.AbilityID] || 0)) return Get_Return(1); // 이미 최대 레벨 + // 특성 선행 조건 체크 + if (data.n_RequireAbility1 > 0) + { + var requireData = table.find(f => f.n_AbilityID == data.n_RequireAbility1); + if (!urod.Ability[data.n_RequireAbility1] || urod.Ability[data.n_RequireAbility1] < requireData.n_MaxUpgradeLevel) + return Get_Return(5); // 선행 특성이 최고 레벨이 아님 + } + if (data.n_RequireAbility2 > 0) + { + var requireData = table.find(f => f.n_AbilityID == data.n_RequireAbility2); + if (!urod.Ability[data.n_RequireAbility2] || urod.Ability[data.n_RequireAbility2] < requireData.n_MaxUpgradeLevel) + return Get_Return(5); // 선행 특성이 최고 레벨이 아님 + } + var global = Get_GlobalValueTable(); var matdata = global.find(f => f.s_ID == "n_AbilityMaterialID"); if (!matdata) return Get_Return(4); // 설정 누락 diff --git a/Assets/Script/Server/ServerInfo.cs b/Assets/Script/Server/ServerInfo.cs index 281b4112c..07c39a4ae 100644 --- a/Assets/Script/Server/ServerInfo.cs +++ b/Assets/Script/Server/ServerInfo.cs @@ -949,6 +949,7 @@ public class ServerInfo : MyCoroutine case 2: ToastUI.Ins.Set(388); break; case 3: ToastUI.Ins.Set(999900004); break; case 4: ToastUI.Ins.Set(999900005); break; + case 5: ToastUI.Ins.Set(235); break; } } else diff --git a/Assets/Script/UI/PC/Ability/PCAbilityCard.cs b/Assets/Script/UI/PC/Ability/PCAbilityCard.cs index d99819716..6969a3a31 100644 --- a/Assets/Script/UI/PC/Ability/PCAbilityCard.cs +++ b/Assets/Script/UI/PC/Ability/PCAbilityCard.cs @@ -51,6 +51,11 @@ public class PCAbilityCard : CardBase DSUtil.InActivateGameObjects(gos_arrow); } + public override void Do_SomeThing() + { + m_Data = null; + } + public void OnClick_Ability() { if (CardType == eUICardType.UI) diff --git a/Assets/Script/UI/PC/Ability/PCAbilityCards.cs b/Assets/Script/UI/PC/Ability/PCAbilityCards.cs index 4e8e8d6e1..a4a3552b4 100644 --- a/Assets/Script/UI/PC/Ability/PCAbilityCards.cs +++ b/Assets/Script/UI/PC/Ability/PCAbilityCards.cs @@ -35,6 +35,9 @@ public class PCAbilityCards : CardBase { gameObject.SetActive(false); for (int i = 0; i < arr_PCAbilityCard.Length; i++) + { + arr_PCAbilityCard[i].Do_SomeThing(); arr_PCAbilityCard[i].Set_CardType(eUICardType.UI); + } } } \ No newline at end of file diff --git a/Assets/Script/UI/PC/Ability/PCAbilityUI.cs b/Assets/Script/UI/PC/Ability/PCAbilityUI.cs index 1b6fe16b0..a51ff1f49 100644 --- a/Assets/Script/UI/PC/Ability/PCAbilityUI.cs +++ b/Assets/Script/UI/PC/Ability/PCAbilityUI.cs @@ -43,7 +43,7 @@ public class PCAbilityUI : PCUIMenu { sdata.Init_Ability(CurType); MyValue.Get_ActorStatInfoorNull(eRole.PC); - Set(); + Set_UI(); sdata.Add_MissionCount(ePurpose.HERO_ABILITY_RESET_ACC); }); } diff --git a/Assets/Script/UI/PC/Ability/PCAbilityUI_Scrollview.cs b/Assets/Script/UI/PC/Ability/PCAbilityUI_Scrollview.cs index 3d6f05ace..8f258a2d2 100644 --- a/Assets/Script/UI/PC/Ability/PCAbilityUI_Scrollview.cs +++ b/Assets/Script/UI/PC/Ability/PCAbilityUI_Scrollview.cs @@ -2,7 +2,7 @@ public class PCAbilityUI_Scrollview : uScrollViewMgr { public void Set(eBattleType battleType) { - Set_ScrollView_NotSet(70); + Set_ScrollView_NotSet(30); for (int i = 0; i < list_CardBase.Count; i++) { list_CardBase[i].Do_SomeThing();