From 81eb5720fcac39954ebb0df0e20211a360ca27ea Mon Sep 17 00:00:00 2001 From: VDH Date: Wed, 7 Jan 2026 14:45:32 +0700 Subject: [PATCH 01/22] skill ui progressing --- .../PerfectWorld/Scripts/Common/EC_Configs.cs | 2 +- .../Scripts/Managers/CECManager.cs | 1 + .../PerfectWorld/Scripts/Managers/EC_Skill.cs | 1 - .../Scripts/ModelFiles/CECTaoistRank.cs | 3 +- .../Scripts/Skills/SkillStubs1.cs | 446 +++++++++--------- Assets/PerfectWorld/Scripts/Skills/skill.cs | 25 +- Assets/PerfectWorld/Scripts/Skills/skill1.cs | 24 +- Assets/PerfectWorld/Scripts/Skills/skill7.cs | 1 + Assets/PerfectWorld/Scripts/Skills/skill8.cs | 1 + Assets/PerfectWorld/Scripts/Skills/skill9.cs | 1 + .../Scripts/UI/Dialogs/CDlgSkillSubList.cs | 12 +- Assets/PerfectWorld/Scripts/skill2.cs | 171 +++++++ Assets/Prefabs/UI/SkillUI.prefab | 57 +-- Assets/Scripts/CECHostPlayer.cs | 1 - 14 files changed, 468 insertions(+), 278 deletions(-) create mode 100644 Assets/PerfectWorld/Scripts/skill2.cs diff --git a/Assets/PerfectWorld/Scripts/Common/EC_Configs.cs b/Assets/PerfectWorld/Scripts/Common/EC_Configs.cs index eceb653481..51a94a36d9 100644 --- a/Assets/PerfectWorld/Scripts/Common/EC_Configs.cs +++ b/Assets/PerfectWorld/Scripts/Common/EC_Configs.cs @@ -1083,7 +1083,7 @@ namespace BrewMonster } else if (dwVer > EC_ConfigConstants.EC_CONFIG_VERSION) { - throw new Exception("CECConfigs::LoadUserConfigData, version mismatch"); + throw new Exception("CECConfigs::LoadUserConfigData, version mismatch dwVer="+ dwVer); } m_vs.Read(reader, dwVer); m_gs.Read(reader, dwVer); diff --git a/Assets/PerfectWorld/Scripts/Managers/CECManager.cs b/Assets/PerfectWorld/Scripts/Managers/CECManager.cs index df56adc1af..e51446f972 100644 --- a/Assets/PerfectWorld/Scripts/Managers/CECManager.cs +++ b/Assets/PerfectWorld/Scripts/Managers/CECManager.cs @@ -156,5 +156,6 @@ namespace BrewMonster.Managers + diff --git a/Assets/PerfectWorld/Scripts/Managers/EC_Skill.cs b/Assets/PerfectWorld/Scripts/Managers/EC_Skill.cs index f37a48d445..e737f4f1f7 100644 --- a/Assets/PerfectWorld/Scripts/Managers/EC_Skill.cs +++ b/Assets/PerfectWorld/Scripts/Managers/EC_Skill.cs @@ -148,7 +148,6 @@ namespace BrewMonster if (m_bCooling) { - BMLogger.LogError($"CECSkill Tick m_bCooling: = {m_bCooling}, m_iCoolCnt={m_iCoolCnt}"); // In cooling state m_iCoolCnt -= tickTime; if (m_iCoolCnt <= 0) diff --git a/Assets/PerfectWorld/Scripts/ModelFiles/CECTaoistRank.cs b/Assets/PerfectWorld/Scripts/ModelFiles/CECTaoistRank.cs index 5156504fe2..b26e6487e4 100644 --- a/Assets/PerfectWorld/Scripts/ModelFiles/CECTaoistRank.cs +++ b/Assets/PerfectWorld/Scripts/ModelFiles/CECTaoistRank.cs @@ -17,6 +17,7 @@ namespace BrewMonster [RuntimeInitializeOnLoadMethod(RuntimeInitializeLoadType.BeforeSceneLoad)] private static void OnPlay() { + BMLogger.Log("CECTaoistRank OnPlay Reset"); initComplete = false; CECTaoistRank[] s_allTaoistRanks = new CECTaoistRank[(int)ToaistRank.TotalRankCount]; } @@ -131,7 +132,7 @@ namespace BrewMonster { return; } - for (int i = 0; i < (int)ToaistRank.TotalRankCount; i++) + for (int i = (int)ToaistRank.TotalRankCount - 1; i >= 0; i--) { if (s_allTaoistRanks[i] == null) { diff --git a/Assets/PerfectWorld/Scripts/Skills/SkillStubs1.cs b/Assets/PerfectWorld/Scripts/Skills/SkillStubs1.cs index 50f0cf2b66..80f9dab211 100644 --- a/Assets/PerfectWorld/Scripts/Skills/SkillStubs1.cs +++ b/Assets/PerfectWorld/Scripts/Skills/SkillStubs1.cs @@ -40,229 +40,229 @@ namespace BrewMonster public static Skill78Stub __stub_Skill78Stub = new Skill78Stub(); public static Skill79Stub __stub_Skill79Stub = new Skill79Stub(); public static Skill80Stub __stub_Skill80Stub = new Skill80Stub(); - //public static Skill176Stub __stub_Skill176Stub = new Skill176Stub(); - //public static Skill177Stub __stub_Skill177Stub = new Skill177Stub(); - //public static Skill178Stub __stub_Skill178Stub = new Skill178Stub(); - //public static Skill179Stub __stub_Skill179Stub = new Skill179Stub(); - //public static Skill187Stub __stub_Skill187Stub = new Skill187Stub(); - //public static Skill226Stub __stub_Skill226Stub = new Skill226Stub(); - //public static Skill227Stub __stub_Skill227Stub = new Skill227Stub(); - //public static Skill362Stub __stub_Skill362Stub = new Skill362Stub(); - //public static Skill363Stub __stub_Skill363Stub = new Skill363Stub(); - //public static Skill374Stub __stub_Skill374Stub = new Skill374Stub(); - //public static Skill375Stub __stub_Skill375Stub = new Skill375Stub(); - //public static Skill376Stub __stub_Skill376Stub = new Skill376Stub(); - //public static Skill377Stub __stub_Skill377Stub = new Skill377Stub(); - //public static Skill378Stub __stub_Skill378Stub = new Skill378Stub(); - //public static Skill379Stub __stub_Skill379Stub = new Skill379Stub(); - //public static Skill380Stub __stub_Skill380Stub = new Skill380Stub(); - //public static Skill381Stub __stub_Skill381Stub = new Skill381Stub(); - //public static Skill382Stub __stub_Skill382Stub = new Skill382Stub(); - //public static Skill383Stub __stub_Skill383Stub = new Skill383Stub(); - //public static Skill384Stub __stub_Skill384Stub = new Skill384Stub(); - //public static Skill385Stub __stub_Skill385Stub = new Skill385Stub(); - //public static Skill386Stub __stub_Skill386Stub = new Skill386Stub(); - //public static Skill387Stub __stub_Skill387Stub = new Skill387Stub(); - //public static Skill388Stub __stub_Skill388Stub = new Skill388Stub(); - //public static Skill389Stub __stub_Skill389Stub = new Skill389Stub(); - //public static Skill390Stub __stub_Skill390Stub = new Skill390Stub(); - //public static Skill391Stub __stub_Skill391Stub = new Skill391Stub(); - //public static Skill392Stub __stub_Skill392Stub = new Skill392Stub(); - //public static Skill393Stub __stub_Skill393Stub = new Skill393Stub(); - //public static Skill394Stub __stub_Skill394Stub = new Skill394Stub(); - //public static Skill395Stub __stub_Skill395Stub = new Skill395Stub(); - //public static Skill396Stub __stub_Skill396Stub = new Skill396Stub(); - //public static Skill397Stub __stub_Skill397Stub = new Skill397Stub(); - //public static Skill398Stub __stub_Skill398Stub = new Skill398Stub(); - //public static Skill399Stub __stub_Skill399Stub = new Skill399Stub(); - //public static Skill400Stub __stub_Skill400Stub = new Skill400Stub(); - //public static Skill401Stub __stub_Skill401Stub = new Skill401Stub(); - //public static Skill402Stub __stub_Skill402Stub = new Skill402Stub(); - //public static Skill403Stub __stub_Skill403Stub = new Skill403Stub(); - //public static Skill404Stub __stub_Skill404Stub = new Skill404Stub(); - //public static Skill405Stub __stub_Skill405Stub = new Skill405Stub(); - //public static Skill406Stub __stub_Skill406Stub = new Skill406Stub(); - //public static Skill407Stub __stub_Skill407Stub = new Skill407Stub(); - //public static Skill408Stub __stub_Skill408Stub = new Skill408Stub(); - //public static Skill409Stub __stub_Skill409Stub = new Skill409Stub(); - //public static Skill410Stub __stub_Skill410Stub = new Skill410Stub(); - //public static Skill411Stub __stub_Skill411Stub = new Skill411Stub(); - //public static Skill412Stub __stub_Skill412Stub = new Skill412Stub(); - //public static Skill413Stub __stub_Skill413Stub = new Skill413Stub(); - //public static Skill414Stub __stub_Skill414Stub = new Skill414Stub(); - //public static Skill415Stub __stub_Skill415Stub = new Skill415Stub(); - //public static Skill416Stub __stub_Skill416Stub = new Skill416Stub(); - //public static Skill417Stub __stub_Skill417Stub = new Skill417Stub(); - //public static Skill418Stub __stub_Skill418Stub = new Skill418Stub(); - //public static Skill419Stub __stub_Skill419Stub = new Skill419Stub(); - //public static Skill420Stub __stub_Skill420Stub = new Skill420Stub(); - //public static Skill421Stub __stub_Skill421Stub = new Skill421Stub(); - //public static Skill422Stub __stub_Skill422Stub = new Skill422Stub(); - //public static Skill423Stub __stub_Skill423Stub = new Skill423Stub(); - //public static Skill424Stub __stub_Skill424Stub = new Skill424Stub(); - //public static Skill425Stub __stub_Skill425Stub = new Skill425Stub(); - //public static Skill426Stub __stub_Skill426Stub = new Skill426Stub(); - //public static Skill427Stub __stub_Skill427Stub = new Skill427Stub(); - //public static Skill428Stub __stub_Skill428Stub = new Skill428Stub(); - //public static Skill429Stub __stub_Skill429Stub = new Skill429Stub(); - //public static Skill430Stub __stub_Skill430Stub = new Skill430Stub(); - //public static Skill431Stub __stub_Skill431Stub = new Skill431Stub(); - //public static Skill432Stub __stub_Skill432Stub = new Skill432Stub(); - //public static Skill433Stub __stub_Skill433Stub = new Skill433Stub(); - //public static Skill434Stub __stub_Skill434Stub = new Skill434Stub(); - //public static Skill435Stub __stub_Skill435Stub = new Skill435Stub(); - //public static Skill436Stub __stub_Skill436Stub = new Skill436Stub(); - //public static Skill437Stub __stub_Skill437Stub = new Skill437Stub(); - //public static Skill438Stub __stub_Skill438Stub = new Skill438Stub(); - //public static Skill439Stub __stub_Skill439Stub = new Skill439Stub(); - //public static Skill896Stub __stub_Skill896Stub = new Skill896Stub(); - //public static Skill897Stub __stub_Skill897Stub = new Skill897Stub(); - //public static Skill898Stub __stub_Skill898Stub = new Skill898Stub(); - //public static Skill899Stub __stub_Skill899Stub = new Skill899Stub(); - //public static Skill900Stub __stub_Skill900Stub = new Skill900Stub(); - //public static Skill923Stub __stub_Skill923Stub = new Skill923Stub(); - //public static Skill924Stub __stub_Skill924Stub = new Skill924Stub(); - //public static Skill1195Stub __stub_Skill1195Stub = new Skill1195Stub(); - //public static Skill1815Stub __stub_Skill1815Stub = new Skill1815Stub(); - //public static Skill1816Stub __stub_Skill1816Stub = new Skill1816Stub(); - //public static Skill1817Stub __stub_Skill1817Stub = new Skill1817Stub(); - //public static Skill1818Stub __stub_Skill1818Stub = new Skill1818Stub(); - //public static Skill1819Stub __stub_Skill1819Stub = new Skill1819Stub(); - //public static Skill1868Stub __stub_Skill1868Stub = new Skill1868Stub(); - //public static Skill1871Stub __stub_Skill1871Stub = new Skill1871Stub(); - //public static Skill1872Stub __stub_Skill1872Stub = new Skill1872Stub(); - //public static Skill2206Stub __stub_Skill2206Stub = new Skill2206Stub(); - //public static Skill2207Stub __stub_Skill2207Stub = new Skill2207Stub(); - //public static Skill2208Stub __stub_Skill2208Stub = new Skill2208Stub(); - //public static Skill2209Stub __stub_Skill2209Stub = new Skill2209Stub(); - //public static Skill2210Stub __stub_Skill2210Stub = new Skill2210Stub(); - //public static Skill2211Stub __stub_Skill2211Stub = new Skill2211Stub(); - //public static Skill2352Stub __stub_Skill2352Stub = new Skill2352Stub(); - //public static Skill2367Stub __stub_Skill2367Stub = new Skill2367Stub(); - //public static Skill2368Stub __stub_Skill2368Stub = new Skill2368Stub(); - //public static Skill2369Stub __stub_Skill2369Stub = new Skill2369Stub(); - //public static Skill2370Stub __stub_Skill2370Stub = new Skill2370Stub(); - //public static Skill2371Stub __stub_Skill2371Stub = new Skill2371Stub(); - //public static Skill2372Stub __stub_Skill2372Stub = new Skill2372Stub(); - //public static Skill2373Stub __stub_Skill2373Stub = new Skill2373Stub(); - //public static Skill2374Stub __stub_Skill2374Stub = new Skill2374Stub(); - //public static Skill2375Stub __stub_Skill2375Stub = new Skill2375Stub(); - //public static Skill7Stub __stub_Skill7Stub = new Skill7Stub(); - //public static Skill8Stub __stub_Skill8Stub = new Skill8Stub(); - //public static Skill9Stub __stub_Skill9Stub = new Skill9Stub(); - //public static Skill10Stub __stub_Skill10Stub = new Skill10Stub(); - //public static Skill53Stub __stub_Skill53Stub = new Skill53Stub(); - //public static Skill81Stub __stub_Skill81Stub = new Skill81Stub(); - //public static Skill84Stub __stub_Skill84Stub = new Skill84Stub(); - //public static Skill85Stub __stub_Skill85Stub = new Skill85Stub(); - //public static Skill86Stub __stub_Skill86Stub = new Skill86Stub(); - //public static Skill87Stub __stub_Skill87Stub = new Skill87Stub(); - //public static Skill88Stub __stub_Skill88Stub = new Skill88Stub(); - //public static Skill89Stub __stub_Skill89Stub = new Skill89Stub(); - //public static Skill90Stub __stub_Skill90Stub = new Skill90Stub(); - //public static Skill91Stub __stub_Skill91Stub = new Skill91Stub(); - //public static Skill92Stub __stub_Skill92Stub = new Skill92Stub(); - //public static Skill93Stub __stub_Skill93Stub = new Skill93Stub(); - //public static Skill94Stub __stub_Skill94Stub = new Skill94Stub(); - //public static Skill95Stub __stub_Skill95Stub = new Skill95Stub(); - //public static Skill96Stub __stub_Skill96Stub = new Skill96Stub(); - //public static Skill97Stub __stub_Skill97Stub = new Skill97Stub(); - //public static Skill98Stub __stub_Skill98Stub = new Skill98Stub(); - //public static Skill99Stub __stub_Skill99Stub = new Skill99Stub(); - //public static Skill100Stub __stub_Skill100Stub = new Skill100Stub(); - //public static Skill101Stub __stub_Skill101Stub = new Skill101Stub(); - //public static Skill180Stub __stub_Skill180Stub = new Skill180Stub(); - //public static Skill181Stub __stub_Skill181Stub = new Skill181Stub(); - //public static Skill182Stub __stub_Skill182Stub = new Skill182Stub(); - //public static Skill183Stub __stub_Skill183Stub = new Skill183Stub(); - //public static Skill184Stub __stub_Skill184Stub = new Skill184Stub(); - //public static Skill228Stub __stub_Skill228Stub = new Skill228Stub(); - //public static Skill229Stub __stub_Skill229Stub = new Skill229Stub(); - //public static Skill364Stub __stub_Skill364Stub = new Skill364Stub(); - //public static Skill365Stub __stub_Skill365Stub = new Skill365Stub(); - //public static Skill440Stub __stub_Skill440Stub = new Skill440Stub(); - //public static Skill441Stub __stub_Skill441Stub = new Skill441Stub(); - //public static Skill442Stub __stub_Skill442Stub = new Skill442Stub(); - //public static Skill443Stub __stub_Skill443Stub = new Skill443Stub(); - //public static Skill444Stub __stub_Skill444Stub = new Skill444Stub(); - //public static Skill445Stub __stub_Skill445Stub = new Skill445Stub(); - //public static Skill446Stub __stub_Skill446Stub = new Skill446Stub(); - //public static Skill447Stub __stub_Skill447Stub = new Skill447Stub(); - //public static Skill448Stub __stub_Skill448Stub = new Skill448Stub(); - //public static Skill449Stub __stub_Skill449Stub = new Skill449Stub(); - //public static Skill450Stub __stub_Skill450Stub = new Skill450Stub(); - //public static Skill451Stub __stub_Skill451Stub = new Skill451Stub(); - //public static Skill452Stub __stub_Skill452Stub = new Skill452Stub(); - //public static Skill453Stub __stub_Skill453Stub = new Skill453Stub(); - //public static Skill454Stub __stub_Skill454Stub = new Skill454Stub(); - //public static Skill455Stub __stub_Skill455Stub = new Skill455Stub(); - //public static Skill456Stub __stub_Skill456Stub = new Skill456Stub(); - //public static Skill457Stub __stub_Skill457Stub = new Skill457Stub(); - //public static Skill458Stub __stub_Skill458Stub = new Skill458Stub(); - //public static Skill459Stub __stub_Skill459Stub = new Skill459Stub(); - //public static Skill460Stub __stub_Skill460Stub = new Skill460Stub(); - //public static Skill461Stub __stub_Skill461Stub = new Skill461Stub(); - //public static Skill462Stub __stub_Skill462Stub = new Skill462Stub(); - //public static Skill463Stub __stub_Skill463Stub = new Skill463Stub(); - //public static Skill464Stub __stub_Skill464Stub = new Skill464Stub(); - //public static Skill465Stub __stub_Skill465Stub = new Skill465Stub(); - //public static Skill466Stub __stub_Skill466Stub = new Skill466Stub(); - //public static Skill467Stub __stub_Skill467Stub = new Skill467Stub(); - //public static Skill468Stub __stub_Skill468Stub = new Skill468Stub(); - //public static Skill469Stub __stub_Skill469Stub = new Skill469Stub(); - //public static Skill470Stub __stub_Skill470Stub = new Skill470Stub(); - //public static Skill471Stub __stub_Skill471Stub = new Skill471Stub(); - //public static Skill472Stub __stub_Skill472Stub = new Skill472Stub(); - //public static Skill473Stub __stub_Skill473Stub = new Skill473Stub(); - //public static Skill474Stub __stub_Skill474Stub = new Skill474Stub(); - //public static Skill475Stub __stub_Skill475Stub = new Skill475Stub(); - //public static Skill476Stub __stub_Skill476Stub = new Skill476Stub(); - //public static Skill477Stub __stub_Skill477Stub = new Skill477Stub(); - //public static Skill478Stub __stub_Skill478Stub = new Skill478Stub(); - //public static Skill479Stub __stub_Skill479Stub = new Skill479Stub(); - //public static Skill480Stub __stub_Skill480Stub = new Skill480Stub(); - //public static Skill481Stub __stub_Skill481Stub = new Skill481Stub(); - //public static Skill482Stub __stub_Skill482Stub = new Skill482Stub(); - //public static Skill483Stub __stub_Skill483Stub = new Skill483Stub(); - //public static Skill484Stub __stub_Skill484Stub = new Skill484Stub(); - //public static Skill485Stub __stub_Skill485Stub = new Skill485Stub(); - //public static Skill486Stub __stub_Skill486Stub = new Skill486Stub(); - //public static Skill487Stub __stub_Skill487Stub = new Skill487Stub(); - //public static Skill488Stub __stub_Skill488Stub = new Skill488Stub(); - //public static Skill489Stub __stub_Skill489Stub = new Skill489Stub(); - //public static Skill490Stub __stub_Skill490Stub = new Skill490Stub(); - //public static Skill491Stub __stub_Skill491Stub = new Skill491Stub(); - //public static Skill901Stub __stub_Skill901Stub = new Skill901Stub(); - //public static Skill902Stub __stub_Skill902Stub = new Skill902Stub(); - //public static Skill903Stub __stub_Skill903Stub = new Skill903Stub(); - //public static Skill904Stub __stub_Skill904Stub = new Skill904Stub(); - //public static Skill905Stub __stub_Skill905Stub = new Skill905Stub(); - //public static Skill925Stub __stub_Skill925Stub = new Skill925Stub(); - //public static Skill926Stub __stub_Skill926Stub = new Skill926Stub(); - //public static Skill1805Stub __stub_Skill1805Stub = new Skill1805Stub(); - //public static Skill1806Stub __stub_Skill1806Stub = new Skill1806Stub(); - //public static Skill1807Stub __stub_Skill1807Stub = new Skill1807Stub(); - //public static Skill1808Stub __stub_Skill1808Stub = new Skill1808Stub(); - //public static Skill1809Stub __stub_Skill1809Stub = new Skill1809Stub(); - //public static Skill1864Stub __stub_Skill1864Stub = new Skill1864Stub(); - //public static Skill1865Stub __stub_Skill1865Stub = new Skill1865Stub(); - //public static Skill1873Stub __stub_Skill1873Stub = new Skill1873Stub(); - //public static Skill1874Stub __stub_Skill1874Stub = new Skill1874Stub(); - //public static Skill1951Stub __stub_Skill1951Stub = new Skill1951Stub(); - //public static Skill2254Stub __stub_Skill2254Stub = new Skill2254Stub(); - //public static Skill2255Stub __stub_Skill2255Stub = new Skill2255Stub(); - //public static Skill2256Stub __stub_Skill2256Stub = new Skill2256Stub(); - //public static Skill2257Stub __stub_Skill2257Stub = new Skill2257Stub(); - //public static Skill2258Stub __stub_Skill2258Stub = new Skill2258Stub(); - //public static Skill2259Stub __stub_Skill2259Stub = new Skill2259Stub(); - //public static Skill2260Stub __stub_Skill2260Stub = new Skill2260Stub(); - //public static Skill2261Stub __stub_Skill2261Stub = new Skill2261Stub(); - //public static Skill2262Stub __stub_Skill2262Stub = new Skill2262Stub(); - //public static Skill2263Stub __stub_Skill2263Stub = new Skill2263Stub(); - //public static Skill2264Stub __stub_Skill2264Stub = new Skill2264Stub(); - //public static Skill2265Stub __stub_Skill2265Stub = new Skill2265Stub(); - //public static Skill2452Stub __stub_Skill2452Stub = new Skill2452Stub(); - //public static Skill2453Stub __stub_Skill2453Stub = new Skill2453Stub(); + public static Skill176Stub __stub_Skill176Stub = new Skill176Stub(); + public static Skill177Stub __stub_Skill177Stub = new Skill177Stub(); + public static Skill178Stub __stub_Skill178Stub = new Skill178Stub(); + public static Skill179Stub __stub_Skill179Stub = new Skill179Stub(); + public static Skill187Stub __stub_Skill187Stub = new Skill187Stub(); + public static Skill226Stub __stub_Skill226Stub = new Skill226Stub(); + public static Skill227Stub __stub_Skill227Stub = new Skill227Stub(); + public static Skill362Stub __stub_Skill362Stub = new Skill362Stub(); + public static Skill363Stub __stub_Skill363Stub = new Skill363Stub(); + public static Skill374Stub __stub_Skill374Stub = new Skill374Stub(); + public static Skill375Stub __stub_Skill375Stub = new Skill375Stub(); + public static Skill376Stub __stub_Skill376Stub = new Skill376Stub(); + public static Skill377Stub __stub_Skill377Stub = new Skill377Stub(); + public static Skill378Stub __stub_Skill378Stub = new Skill378Stub(); + public static Skill379Stub __stub_Skill379Stub = new Skill379Stub(); + public static Skill380Stub __stub_Skill380Stub = new Skill380Stub(); + public static Skill381Stub __stub_Skill381Stub = new Skill381Stub(); + public static Skill382Stub __stub_Skill382Stub = new Skill382Stub(); + public static Skill383Stub __stub_Skill383Stub = new Skill383Stub(); + public static Skill384Stub __stub_Skill384Stub = new Skill384Stub(); + public static Skill385Stub __stub_Skill385Stub = new Skill385Stub(); + public static Skill386Stub __stub_Skill386Stub = new Skill386Stub(); + public static Skill387Stub __stub_Skill387Stub = new Skill387Stub(); + public static Skill388Stub __stub_Skill388Stub = new Skill388Stub(); + public static Skill389Stub __stub_Skill389Stub = new Skill389Stub(); + public static Skill390Stub __stub_Skill390Stub = new Skill390Stub(); + public static Skill391Stub __stub_Skill391Stub = new Skill391Stub(); + public static Skill392Stub __stub_Skill392Stub = new Skill392Stub(); + public static Skill393Stub __stub_Skill393Stub = new Skill393Stub(); + public static Skill394Stub __stub_Skill394Stub = new Skill394Stub(); + public static Skill395Stub __stub_Skill395Stub = new Skill395Stub(); + public static Skill396Stub __stub_Skill396Stub = new Skill396Stub(); + public static Skill397Stub __stub_Skill397Stub = new Skill397Stub(); + public static Skill398Stub __stub_Skill398Stub = new Skill398Stub(); + public static Skill399Stub __stub_Skill399Stub = new Skill399Stub(); + public static Skill400Stub __stub_Skill400Stub = new Skill400Stub(); + public static Skill401Stub __stub_Skill401Stub = new Skill401Stub(); + public static Skill402Stub __stub_Skill402Stub = new Skill402Stub(); + public static Skill403Stub __stub_Skill403Stub = new Skill403Stub(); + public static Skill404Stub __stub_Skill404Stub = new Skill404Stub(); + public static Skill405Stub __stub_Skill405Stub = new Skill405Stub(); + public static Skill406Stub __stub_Skill406Stub = new Skill406Stub(); + public static Skill407Stub __stub_Skill407Stub = new Skill407Stub(); + public static Skill408Stub __stub_Skill408Stub = new Skill408Stub(); + public static Skill409Stub __stub_Skill409Stub = new Skill409Stub(); + public static Skill410Stub __stub_Skill410Stub = new Skill410Stub(); + public static Skill411Stub __stub_Skill411Stub = new Skill411Stub(); + public static Skill412Stub __stub_Skill412Stub = new Skill412Stub(); + public static Skill413Stub __stub_Skill413Stub = new Skill413Stub(); + public static Skill414Stub __stub_Skill414Stub = new Skill414Stub(); + public static Skill415Stub __stub_Skill415Stub = new Skill415Stub(); + public static Skill416Stub __stub_Skill416Stub = new Skill416Stub(); + public static Skill417Stub __stub_Skill417Stub = new Skill417Stub(); + public static Skill418Stub __stub_Skill418Stub = new Skill418Stub(); + public static Skill419Stub __stub_Skill419Stub = new Skill419Stub(); + public static Skill420Stub __stub_Skill420Stub = new Skill420Stub(); + public static Skill421Stub __stub_Skill421Stub = new Skill421Stub(); + public static Skill422Stub __stub_Skill422Stub = new Skill422Stub(); + public static Skill423Stub __stub_Skill423Stub = new Skill423Stub(); + public static Skill424Stub __stub_Skill424Stub = new Skill424Stub(); + public static Skill425Stub __stub_Skill425Stub = new Skill425Stub(); + public static Skill426Stub __stub_Skill426Stub = new Skill426Stub(); + public static Skill427Stub __stub_Skill427Stub = new Skill427Stub(); + public static Skill428Stub __stub_Skill428Stub = new Skill428Stub(); + public static Skill429Stub __stub_Skill429Stub = new Skill429Stub(); + public static Skill430Stub __stub_Skill430Stub = new Skill430Stub(); + public static Skill431Stub __stub_Skill431Stub = new Skill431Stub(); + public static Skill432Stub __stub_Skill432Stub = new Skill432Stub(); + public static Skill433Stub __stub_Skill433Stub = new Skill433Stub(); + public static Skill434Stub __stub_Skill434Stub = new Skill434Stub(); + public static Skill435Stub __stub_Skill435Stub = new Skill435Stub(); + public static Skill436Stub __stub_Skill436Stub = new Skill436Stub(); + public static Skill437Stub __stub_Skill437Stub = new Skill437Stub(); + public static Skill438Stub __stub_Skill438Stub = new Skill438Stub(); + public static Skill439Stub __stub_Skill439Stub = new Skill439Stub(); + public static Skill896Stub __stub_Skill896Stub = new Skill896Stub(); + public static Skill897Stub __stub_Skill897Stub = new Skill897Stub(); + public static Skill898Stub __stub_Skill898Stub = new Skill898Stub(); + public static Skill899Stub __stub_Skill899Stub = new Skill899Stub(); + public static Skill900Stub __stub_Skill900Stub = new Skill900Stub(); + public static Skill923Stub __stub_Skill923Stub = new Skill923Stub(); + public static Skill924Stub __stub_Skill924Stub = new Skill924Stub(); + public static Skill1195Stub __stub_Skill1195Stub = new Skill1195Stub(); + public static Skill1815Stub __stub_Skill1815Stub = new Skill1815Stub(); + public static Skill1816Stub __stub_Skill1816Stub = new Skill1816Stub(); + public static Skill1817Stub __stub_Skill1817Stub = new Skill1817Stub(); + public static Skill1818Stub __stub_Skill1818Stub = new Skill1818Stub(); + public static Skill1819Stub __stub_Skill1819Stub = new Skill1819Stub(); + public static Skill1868Stub __stub_Skill1868Stub = new Skill1868Stub(); + public static Skill1871Stub __stub_Skill1871Stub = new Skill1871Stub(); + public static Skill1872Stub __stub_Skill1872Stub = new Skill1872Stub(); + public static Skill2206Stub __stub_Skill2206Stub = new Skill2206Stub(); + public static Skill2207Stub __stub_Skill2207Stub = new Skill2207Stub(); + public static Skill2208Stub __stub_Skill2208Stub = new Skill2208Stub(); + public static Skill2209Stub __stub_Skill2209Stub = new Skill2209Stub(); + public static Skill2210Stub __stub_Skill2210Stub = new Skill2210Stub(); + public static Skill2211Stub __stub_Skill2211Stub = new Skill2211Stub(); + public static Skill2352Stub __stub_Skill2352Stub = new Skill2352Stub(); + public static Skill2367Stub __stub_Skill2367Stub = new Skill2367Stub(); + public static Skill2368Stub __stub_Skill2368Stub = new Skill2368Stub(); + public static Skill2369Stub __stub_Skill2369Stub = new Skill2369Stub(); + public static Skill2370Stub __stub_Skill2370Stub = new Skill2370Stub(); + public static Skill2371Stub __stub_Skill2371Stub = new Skill2371Stub(); + public static Skill2372Stub __stub_Skill2372Stub = new Skill2372Stub(); + public static Skill2373Stub __stub_Skill2373Stub = new Skill2373Stub(); + public static Skill2374Stub __stub_Skill2374Stub = new Skill2374Stub(); + public static Skill2375Stub __stub_Skill2375Stub = new Skill2375Stub(); + public static Skill7Stub __stub_Skill7Stub = new Skill7Stub(); + public static Skill8Stub __stub_Skill8Stub = new Skill8Stub(); + public static Skill9Stub __stub_Skill9Stub = new Skill9Stub(); + public static Skill10Stub __stub_Skill10Stub = new Skill10Stub(); + public static Skill53Stub __stub_Skill53Stub = new Skill53Stub(); + public static Skill81Stub __stub_Skill81Stub = new Skill81Stub(); + public static Skill84Stub __stub_Skill84Stub = new Skill84Stub(); + public static Skill85Stub __stub_Skill85Stub = new Skill85Stub(); + public static Skill86Stub __stub_Skill86Stub = new Skill86Stub(); + public static Skill87Stub __stub_Skill87Stub = new Skill87Stub(); + public static Skill88Stub __stub_Skill88Stub = new Skill88Stub(); + public static Skill89Stub __stub_Skill89Stub = new Skill89Stub(); + public static Skill90Stub __stub_Skill90Stub = new Skill90Stub(); + public static Skill91Stub __stub_Skill91Stub = new Skill91Stub(); + public static Skill92Stub __stub_Skill92Stub = new Skill92Stub(); + public static Skill93Stub __stub_Skill93Stub = new Skill93Stub(); + public static Skill94Stub __stub_Skill94Stub = new Skill94Stub(); + public static Skill95Stub __stub_Skill95Stub = new Skill95Stub(); + public static Skill96Stub __stub_Skill96Stub = new Skill96Stub(); + public static Skill97Stub __stub_Skill97Stub = new Skill97Stub(); + public static Skill98Stub __stub_Skill98Stub = new Skill98Stub(); + public static Skill99Stub __stub_Skill99Stub = new Skill99Stub(); + public static Skill100Stub __stub_Skill100Stub = new Skill100Stub(); + public static Skill101Stub __stub_Skill101Stub = new Skill101Stub(); + public static Skill180Stub __stub_Skill180Stub = new Skill180Stub(); + public static Skill181Stub __stub_Skill181Stub = new Skill181Stub(); + public static Skill182Stub __stub_Skill182Stub = new Skill182Stub(); + public static Skill183Stub __stub_Skill183Stub = new Skill183Stub(); + public static Skill184Stub __stub_Skill184Stub = new Skill184Stub(); + public static Skill228Stub __stub_Skill228Stub = new Skill228Stub(); + public static Skill229Stub __stub_Skill229Stub = new Skill229Stub(); + public static Skill364Stub __stub_Skill364Stub = new Skill364Stub(); + public static Skill365Stub __stub_Skill365Stub = new Skill365Stub(); + public static Skill440Stub __stub_Skill440Stub = new Skill440Stub(); + public static Skill441Stub __stub_Skill441Stub = new Skill441Stub(); + public static Skill442Stub __stub_Skill442Stub = new Skill442Stub(); + public static Skill443Stub __stub_Skill443Stub = new Skill443Stub(); + public static Skill444Stub __stub_Skill444Stub = new Skill444Stub(); + public static Skill445Stub __stub_Skill445Stub = new Skill445Stub(); + public static Skill446Stub __stub_Skill446Stub = new Skill446Stub(); + public static Skill447Stub __stub_Skill447Stub = new Skill447Stub(); + public static Skill448Stub __stub_Skill448Stub = new Skill448Stub(); + public static Skill449Stub __stub_Skill449Stub = new Skill449Stub(); + public static Skill450Stub __stub_Skill450Stub = new Skill450Stub(); + public static Skill451Stub __stub_Skill451Stub = new Skill451Stub(); + public static Skill452Stub __stub_Skill452Stub = new Skill452Stub(); + public static Skill453Stub __stub_Skill453Stub = new Skill453Stub(); + public static Skill454Stub __stub_Skill454Stub = new Skill454Stub(); + public static Skill455Stub __stub_Skill455Stub = new Skill455Stub(); + public static Skill456Stub __stub_Skill456Stub = new Skill456Stub(); + public static Skill457Stub __stub_Skill457Stub = new Skill457Stub(); + public static Skill458Stub __stub_Skill458Stub = new Skill458Stub(); + public static Skill459Stub __stub_Skill459Stub = new Skill459Stub(); + public static Skill460Stub __stub_Skill460Stub = new Skill460Stub(); + public static Skill461Stub __stub_Skill461Stub = new Skill461Stub(); + public static Skill462Stub __stub_Skill462Stub = new Skill462Stub(); + public static Skill463Stub __stub_Skill463Stub = new Skill463Stub(); + public static Skill464Stub __stub_Skill464Stub = new Skill464Stub(); + public static Skill465Stub __stub_Skill465Stub = new Skill465Stub(); + public static Skill466Stub __stub_Skill466Stub = new Skill466Stub(); + public static Skill467Stub __stub_Skill467Stub = new Skill467Stub(); + public static Skill468Stub __stub_Skill468Stub = new Skill468Stub(); + public static Skill469Stub __stub_Skill469Stub = new Skill469Stub(); + public static Skill470Stub __stub_Skill470Stub = new Skill470Stub(); + public static Skill471Stub __stub_Skill471Stub = new Skill471Stub(); + public static Skill472Stub __stub_Skill472Stub = new Skill472Stub(); + public static Skill473Stub __stub_Skill473Stub = new Skill473Stub(); + public static Skill474Stub __stub_Skill474Stub = new Skill474Stub(); + public static Skill475Stub __stub_Skill475Stub = new Skill475Stub(); + public static Skill476Stub __stub_Skill476Stub = new Skill476Stub(); + public static Skill477Stub __stub_Skill477Stub = new Skill477Stub(); + public static Skill478Stub __stub_Skill478Stub = new Skill478Stub(); + public static Skill479Stub __stub_Skill479Stub = new Skill479Stub(); + public static Skill480Stub __stub_Skill480Stub = new Skill480Stub(); + public static Skill481Stub __stub_Skill481Stub = new Skill481Stub(); + public static Skill482Stub __stub_Skill482Stub = new Skill482Stub(); + public static Skill483Stub __stub_Skill483Stub = new Skill483Stub(); + public static Skill484Stub __stub_Skill484Stub = new Skill484Stub(); + public static Skill485Stub __stub_Skill485Stub = new Skill485Stub(); + public static Skill486Stub __stub_Skill486Stub = new Skill486Stub(); + public static Skill487Stub __stub_Skill487Stub = new Skill487Stub(); + public static Skill488Stub __stub_Skill488Stub = new Skill488Stub(); + public static Skill489Stub __stub_Skill489Stub = new Skill489Stub(); + public static Skill490Stub __stub_Skill490Stub = new Skill490Stub(); + public static Skill491Stub __stub_Skill491Stub = new Skill491Stub(); + public static Skill901Stub __stub_Skill901Stub = new Skill901Stub(); + public static Skill902Stub __stub_Skill902Stub = new Skill902Stub(); + public static Skill903Stub __stub_Skill903Stub = new Skill903Stub(); + public static Skill904Stub __stub_Skill904Stub = new Skill904Stub(); + public static Skill905Stub __stub_Skill905Stub = new Skill905Stub(); + public static Skill925Stub __stub_Skill925Stub = new Skill925Stub(); + public static Skill926Stub __stub_Skill926Stub = new Skill926Stub(); + public static Skill1805Stub __stub_Skill1805Stub = new Skill1805Stub(); + public static Skill1806Stub __stub_Skill1806Stub = new Skill1806Stub(); + public static Skill1807Stub __stub_Skill1807Stub = new Skill1807Stub(); + public static Skill1808Stub __stub_Skill1808Stub = new Skill1808Stub(); + public static Skill1809Stub __stub_Skill1809Stub = new Skill1809Stub(); + public static Skill1864Stub __stub_Skill1864Stub = new Skill1864Stub(); + public static Skill1865Stub __stub_Skill1865Stub = new Skill1865Stub(); + public static Skill1873Stub __stub_Skill1873Stub = new Skill1873Stub(); + public static Skill1874Stub __stub_Skill1874Stub = new Skill1874Stub(); + public static Skill1951Stub __stub_Skill1951Stub = new Skill1951Stub(); + public static Skill2254Stub __stub_Skill2254Stub = new Skill2254Stub(); + public static Skill2255Stub __stub_Skill2255Stub = new Skill2255Stub(); + public static Skill2256Stub __stub_Skill2256Stub = new Skill2256Stub(); + public static Skill2257Stub __stub_Skill2257Stub = new Skill2257Stub(); + public static Skill2258Stub __stub_Skill2258Stub = new Skill2258Stub(); + public static Skill2259Stub __stub_Skill2259Stub = new Skill2259Stub(); + public static Skill2260Stub __stub_Skill2260Stub = new Skill2260Stub(); + public static Skill2261Stub __stub_Skill2261Stub = new Skill2261Stub(); + public static Skill2262Stub __stub_Skill2262Stub = new Skill2262Stub(); + public static Skill2263Stub __stub_Skill2263Stub = new Skill2263Stub(); + public static Skill2264Stub __stub_Skill2264Stub = new Skill2264Stub(); + public static Skill2265Stub __stub_Skill2265Stub = new Skill2265Stub(); + public static Skill2452Stub __stub_Skill2452Stub = new Skill2452Stub(); + public static Skill2453Stub __stub_Skill2453Stub = new Skill2453Stub(); #if SKILL_SERVER public static Skill1 __stub_Skill1 = new Skill1(); diff --git a/Assets/PerfectWorld/Scripts/Skills/skill.cs b/Assets/PerfectWorld/Scripts/Skills/skill.cs index f22b7908d2..206330d216 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill.cs @@ -1,4 +1,5 @@ using System.Collections.Generic; +using UnityEngine; namespace BrewMonster.Scripts.Skills { @@ -119,6 +120,8 @@ namespace BrewMonster.Scripts.Skills else return stub.GetPraydistance(this); } + public override int GetCoolingTime() { return stub.GetCoolingtime(this); } + } @@ -188,8 +191,21 @@ namespace BrewMonster.Scripts.Skills public List restrict_weapons = new List(); public static Dictionary map = new Dictionary(); public static Dictionary GetMap() => map; + public static Dictionary> comboSkillMap = new Dictionary>(); + public static Dictionary> GetComboSkMap() => comboSkillMap; - public static Dictionary> inheritSkillMap = new(); + public static Dictionary> inheritSkillMap = new Dictionary>(); + +#if UNITY_EDITOR + [RuntimeInitializeOnLoadMethod(RuntimeInitializeLoadType.BeforeSceneLoad)] + private static void OnPlay() + { + BMLogger.LogError("SkillStub OnPlay Reset"); + map = new Dictionary(); + comboSkillMap = new Dictionary>(); + inheritSkillMap = new Dictionary>(); + } +#endif public SkillStub(uint i) { id = i; @@ -209,9 +225,6 @@ namespace BrewMonster.Scripts.Skills return inheritSkillMap[cls]; } - public static Dictionary> comboSkillMap; - public static Dictionary> GetComboSkMap() => comboSkillMap; - public static SkillStub GetStub(uint i) { return GetMap().TryGetValue(i, out var stub) ? stub : null; @@ -243,10 +256,10 @@ namespace BrewMonster.Scripts.Skills public int GetMaxLevel() { return max_level; } public Range GetRange() { return range; } public bool IsMovingSkill() { return is_movingcast; } - public byte GetType() { return type; } // ����System.Object.GetType // Hide System.Object.GetType + public byte GetType() { return type; } // ����System.Object.GetType // Hide System.Object.GetType // ����ʱ����麯�� // Runtime-related virtual functions - public virtual int GetCoolingtime(Skill skill) { return 0; } + public virtual int GetCoolingtime(Skill skill) { return 5000; } public virtual int GetRequiredSp(Skill skill) { return 0; } public virtual int GetRequiredLevel(Skill skill) { return 0; } public virtual int GetMaxAbility(Skill skill) { return 0; } diff --git a/Assets/PerfectWorld/Scripts/Skills/skill1.cs b/Assets/PerfectWorld/Scripts/Skills/skill1.cs index 1c740b64ec..7fd3898b69 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill1.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill1.cs @@ -84,9 +84,9 @@ namespace BrewMonster public Skill1Stub() : base(1) { cls = 0; - name = "虎击"; - nativename = "虎击"; - icon = "虎击.dds"; + name = ""; + nativename = ""; + icon = ".dds"; max_level = 10; type = 1; apcost = 0; @@ -107,17 +107,12 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "虎击.sgc"; + effect = ""; doenchant = 0; dobless = 0; commoncooldown = 0; commoncooldowntime = 0; restrict_weapons.Add(0); - restrict_weapons.Add(1); - restrict_weapons.Add(182); - restrict_weapons.Add(5); - restrict_weapons.Add(292); - restrict_weapons.Add(9); range = new Range(); range.type = 0; #if SKILL_SERVER @@ -132,9 +127,9 @@ namespace BrewMonster public override float GetMpcost(Skill skill) => (float)(-5 + 7 * skill.GetLevel()); public override int GetExecutetime(Skill skill) => 700; public override int GetCoolingtime(Skill skill) => 3000; - public float GetRadius(Skill skill) => 0f; - public float GetAttackdistance(Skill skill) => 0f; - public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); + public float GetRadius(Skill skill) => 0f; + public float GetAttackdistance(Skill skill) => 0f; + public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); public override float GetPraydistance(Skill skill) => (float)(skill.GetPlayer().GetRange()); public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; @@ -143,10 +138,7 @@ namespace BrewMonster #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) { - string result = string.Format(format, - skill.GetLevel(), - -5 + 7 * skill.GetLevel(), - 1.9 * skill.GetLevel() * skill.GetLevel() + 64 * skill.GetLevel() + 36.7); + string result = string.Format(format, skill.GetLevel(), -5 + 7 * skill.GetLevel(), 1.9 * skill.GetLevel() * skill.GetLevel() + 64 * skill.GetLevel() + 36.7); if (result.Length < length) { buffer.Append(result); diff --git a/Assets/PerfectWorld/Scripts/Skills/skill7.cs b/Assets/PerfectWorld/Scripts/Skills/skill7.cs index a099524133..76d8a1cfcc 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill7.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill7.cs @@ -185,5 +185,6 @@ namespace BrewMonster + diff --git a/Assets/PerfectWorld/Scripts/Skills/skill8.cs b/Assets/PerfectWorld/Scripts/Skills/skill8.cs index a8600ecfd4..3d50c8f131 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill8.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill8.cs @@ -183,5 +183,6 @@ namespace BrewMonster + diff --git a/Assets/PerfectWorld/Scripts/Skills/skill9.cs b/Assets/PerfectWorld/Scripts/Skills/skill9.cs index 03f7b9b796..63da17c8f6 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill9.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill9.cs @@ -122,5 +122,6 @@ namespace BrewMonster + diff --git a/Assets/PerfectWorld/Scripts/UI/Dialogs/CDlgSkillSubList.cs b/Assets/PerfectWorld/Scripts/UI/Dialogs/CDlgSkillSubList.cs index f8261cb92e..88e7ee2c7a 100644 --- a/Assets/PerfectWorld/Scripts/UI/Dialogs/CDlgSkillSubList.cs +++ b/Assets/PerfectWorld/Scripts/UI/Dialogs/CDlgSkillSubList.cs @@ -102,7 +102,7 @@ namespace BrewMonster.UI } } - // 初始化所有阶位子对话框 / Initialize all rank sub dialogs + // 初始化所有阶位子对话框 / Initialize all rank sub dialogs/// private void InitRankDlgs() { if (m_bAllocRankDlgs || m_pSubRank == null || m_contentRoot == null) @@ -115,6 +115,7 @@ namespace BrewMonster.UI taoistRank != CECTaoistRank.GetBaseRankEnd(); taoistRank = taoistRank.GetNext()) { + BMLogger.LogError("CDlgSkillSubList::InitRankDlgs: Creating GetBaseRankBegin rank " + taoistRank.GetID()); CreateOneRankDlg(taoistRank); } @@ -122,6 +123,7 @@ namespace BrewMonster.UI taoistRank != CECTaoistRank.GetGodRankEnd(); taoistRank = taoistRank.GetNext()) { + BMLogger.LogError("CDlgSkillSubList::InitRankDlgs: Creating GetGodRankBegin rank " + taoistRank.GetID()); CreateOneRankDlg(taoistRank); } @@ -129,6 +131,7 @@ namespace BrewMonster.UI taoistRank != CECTaoistRank.GetEvilRankEnd(); taoistRank = taoistRank.GetNext()) { + BMLogger.LogError("CDlgSkillSubList::InitRankDlgs: Creating GetEvilRankBegin rank " + taoistRank.GetID()); CreateOneRankDlg(taoistRank); } } @@ -225,6 +228,7 @@ namespace BrewMonster.UI // ����һ�����漶��Ի��� / Show a rank sub dialog private void AddRankSubDig(int rankID) { + BMLogger.LogError("HoangDev: AddRankSubDig"); if (!m_rankSubDialogs.TryGetValue(rankID, out var pSub)) { return; @@ -233,6 +237,7 @@ namespace BrewMonster.UI pSub.Show(true); //pSub.SetPos(0f, m_curBottom); //m_curBottom += m_rankHeight * m_windowScale; + BMLogger.LogError("HoangDev: AddRankSubDig Done: " + CECTaoistRank.GetTaoistRank(rankID).GetName()); pSub.SetLabel(CECTaoistRank.GetTaoistRank(rankID).GetName()); } @@ -276,20 +281,24 @@ namespace BrewMonster.UI if (allRankProfSkills == null) { + BMLogger.LogError("HoangDev: AddDlgsOfOneRank allRankProfSkills is null"); return; } if (IsEvil() && taoistRank.IsGodRank()) { + BMLogger.LogError("HoangDev: AddDlgsOfOneRank IsEvil() && taoistRank.IsGodRank()"); return; } else if (!IsEvil() && taoistRank.IsEvilRank()) { + BMLogger.LogError("HoangDev: AddDlgsOfOneRank !IsEvil() && taoistRank.IsEvilRank()"); return; } if (!allRankProfSkills.TryGetValue(rankID, out var rankItr) || rankItr == null || rankItr.Count == 0) { + BMLogger.LogError("HoangDev: AddDlgsOfOneRank !allRankProfSkills.TryGetValue(rankID, out var rankItr) || rankItr == null || rankItr.Count == 0"); return; } @@ -318,6 +327,7 @@ namespace BrewMonster.UI } if (rankSkills.Count == 0) { + BMLogger.LogError("HoangDev: AddDlgsOfOneRank rankSkills.Count == 0"); return; } diff --git a/Assets/PerfectWorld/Scripts/skill2.cs b/Assets/PerfectWorld/Scripts/skill2.cs new file mode 100644 index 0000000000..3fa0993399 --- /dev/null +++ b/Assets/PerfectWorld/Scripts/skill2.cs @@ -0,0 +1,171 @@ +#define SKILL_CLIENT +using BrewMonster.Scripts.Skills; +using System.Collections.Generic; +using System.Text; +using UnityEngine; +using static BrewMonster.PET_EVOLVE_CONFIG; + +namespace BrewMonster +{ + +#if SKILL_SERVER + public class Skill2 : Skill + { + public const int SKILL_ID = 2; + + public Skill2() : base(SKILL_ID) + { + } + } +#endif + + public class Skill2Stub : SkillStub + { + private static readonly int[] RequiredLevelArray = { 3, 8, 13, 18, 23, 28, 33, 38, 43, 48 }; + private static readonly int[] RequiredSpArray = { 100, 800, 2100, 4100, 7000, 10900, 16100, 23000, 32000, 44100 }; + private static readonly int[] RequiredMoneyArray = { 10, 90, 220, 400, 630, 1000, 1450, 1900, 2380, 2880 }; + + +#if SKILL_SERVER + public class State1 : SkillStub.State + { + public int GetTime(Skill skill) => 200; + public bool Quit(Skill skill) => false; + public bool Loop(Skill skill) => false; + public bool Bypass(Skill skill) => false; + public void Calculate(Skill skill) + { + skill.GetPlayer().SetDecmp(0.2f *(-2.2f + 5.6f * skill.GetLevel())); + skill.GetPlayer().SetPray(1); + } + public bool Interrupt(Skill skill) => false; + public bool Cancel(Skill skill) => true; + public bool Skip(Skill skill) => false; + } +#endif + +#if SKILL_SERVER + public class State2 : SkillStub.State + { + public int GetTime(Skill skill) => 700; + public bool Quit(Skill skill) => false; + public bool Loop(Skill skill) => false; + public bool Bypass(Skill skill) => false; + public void Calculate(Skill skill) + { + skill.GetPlayer().SetDecmp(0.8f *(-2.2f + 5.6f * skill.GetLevel())); + skill.SetPlus(0); + skill.SetRatio(0); + skill.SetDamage(skill.GetAttack()); + skill.GetPlayer().SetPerform(1); + } + public bool Interrupt(Skill skill) => false; + public bool Cancel(Skill skill) => false; + public bool Skip(Skill skill) => false; + } +#endif + +#if SKILL_SERVER + public class State3 : SkillStub.State + { + public int GetTime(Skill skill) => 0; + public bool Quit(Skill skill) => false; + public bool Loop(Skill skill) => false; + public bool Bypass(Skill skill) => false; + public void Calculate(Skill skill) + { + } + public bool Interrupt(Skill skill) => false; + public bool Cancel(Skill skill) => false; + public bool Skip(Skill skill) => false; + } +#endif + + public Skill2Stub() : base(2) + { + cls = 0; + name = "寸力"; + nativename = "寸力"; + icon = "寸力.dds"; + max_level = 10; + type = 1; + apcost = 0; + arrowcost = 0; + apgain = 5; + attr = 1; + rank = 0; + eventflag = 0; + posdouble = 0; + clslimit = 0; + time_type = 0; + showorder = 1102; + allow_land = true; + allow_air = true; + allow_water = true; + allow_ride = false; + auto_attack = true; + long_range = 0; + restrict_corpse = 0; + allow_forms = 1; + effect = "寸力.sgc"; + doenchant = 1; + dobless = 0; + commoncooldown = 0; + commoncooldowntime = 0; + restrict_weapons.Add(0); + restrict_weapons.Add(1); + restrict_weapons.Add(182); + restrict_weapons.Add(9); + restrict_weapons.Add(5); + restrict_weapons.Add(292); + range = new Range(); + range.type = 0; + pre_skills = new Dictionary(); + pre_skills.Add(1, 1); +#if SKILL_SERVER + statestub.Add(new State1()); + statestub.Add(new State2()); + statestub.Add(new State3()); +#endif + } + + ~Skill2Stub() { } + + public override float GetMpcost(Skill skill) => (float)(-2.2 + 5.6 * skill.GetLevel()); + public override int GetExecutetime(Skill skill) => 700; + public override int GetCoolingtime(Skill skill) => 8000; + public float GetRadius(Skill skill) => 0f; + public float GetAttackdistance(Skill skill) => 0f; + public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); + public override float GetPraydistance(Skill skill) => (float)(skill.GetPlayer().GetRange()); + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + +#if SKILL_CLIENT + public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) + { + string result = string.Format(format, + skill.GetLevel(), + -2.2 + 5.6 * skill.GetLevel(), + 5.9 * skill.GetLevel() * skill.GetLevel() + 126.7 * skill.GetLevel() + 40.5); + if (result.Length < length) + { + buffer.Append(result); + return result.Length; + } + return 0; + } +#endif + +#if SKILL_SERVER + public int GetEnmity(Skill skill) => 0; + public bool StateAttack(Skill skill) => true; + public bool TakeEffect(Skill skill) => true; + public float GetEffectdistance(Skill skill) => 11.7f; + public int GetAttackspeed(Skill skill) => 3; + public float GetHitrate(Skill skill) => 1.2f + 0.05f * skill.GetLevel(); +#endif + } +} + diff --git a/Assets/Prefabs/UI/SkillUI.prefab b/Assets/Prefabs/UI/SkillUI.prefab index 27642c3a16..f1042766fb 100644 --- a/Assets/Prefabs/UI/SkillUI.prefab +++ b/Assets/Prefabs/UI/SkillUI.prefab @@ -2079,9 +2079,9 @@ RectTransform: - {fileID: 4504331075840543341} m_Father: {fileID: 1361524257611413148} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 108.9562, y: -31.05} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 179.9124, y: 68.0217} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8804506040386004496 @@ -5904,9 +5904,9 @@ RectTransform: - {fileID: 2027606699309904338} m_Father: {fileID: 1361524257611413148} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 468.781, y: -31.05} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 179.9124, y: 68.0217} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6741821173640675138 @@ -7867,9 +7867,9 @@ RectTransform: m_Children: [] m_Father: {fileID: 3016923604946316301} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 83.16, y: -48.51895} m_SizeDelta: {x: 166.32, y: 97.0379} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &821733676846102905 @@ -7943,9 +7943,9 @@ RectTransform: - {fileID: 4351609655079222131} m_Father: {fileID: 2825516843822704547} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 126.06315, y: -22.62375} m_SizeDelta: {x: 252.1263, y: 45.2475} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5645061043433811765 @@ -10151,9 +10151,9 @@ RectTransform: - {fileID: 3703262150164293383} m_Father: {fileID: 3016923604946316301} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 83.16, y: -292.4765} m_SizeDelta: {x: 166.32, y: 130.2924} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &5150156580756960231 @@ -11400,9 +11400,9 @@ RectTransform: - {fileID: 131742873718785436} m_Father: {fileID: 3016923604946316301} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 83.16, y: -162.18411} m_SizeDelta: {x: 166.32, y: 130.2924} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &5468634806808161123 @@ -11481,7 +11481,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &2825516843822704547 RectTransform: m_ObjectHideFlags: 0 @@ -11501,7 +11501,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} m_AnchoredPosition: {x: 358.8119, y: -105.62375} - m_SizeDelta: {x: 685.6238, y: 0} + m_SizeDelta: {x: 685.6238, y: 155.2475} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4552529476466259825 CanvasRenderer: @@ -11596,6 +11596,7 @@ MonoBehaviour: m_subDialog: {fileID: 0} m_rectTransform: {fileID: 2825516843822704547} levelName: {fileID: 0} + label: {fileID: 708823501721075410} --- !u!1 &5403634742995450233 GameObject: m_ObjectHideFlags: 0 @@ -13569,7 +13570,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &627631504828013321 RectTransform: m_ObjectHideFlags: 0 @@ -17556,7 +17557,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: -361.27, y: 365.44547} - m_SizeDelta: {x: 722.5344, y: 0} + m_SizeDelta: {x: 722.5344, y: 28} m_Pivot: {x: 0, y: 1} --- !u!222 &7853130943468561016 CanvasRenderer: @@ -17812,9 +17813,9 @@ RectTransform: - {fileID: 187116969457634403} m_Father: {fileID: 2825516843822704547} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 342.81, y: -105.2475} m_SizeDelta: {x: 685.62, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &114056069577405476 @@ -18839,9 +18840,9 @@ RectTransform: - {fileID: 911293677621153352} m_Father: {fileID: 1361524257611413148} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 288.8686, y: -31.05} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 179.9124, y: 68.0217} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5623009994815814977 diff --git a/Assets/Scripts/CECHostPlayer.cs b/Assets/Scripts/CECHostPlayer.cs index b3f6bfea31..a0f10b220a 100644 --- a/Assets/Scripts/CECHostPlayer.cs +++ b/Assets/Scripts/CECHostPlayer.cs @@ -619,7 +619,6 @@ namespace BrewMonster private void OnMsgHstCoolTimeData(ECMSG Msg) { - BMLogger.LogError("HoangDev : OnMsgHstCoolTimeData "); cmd_cooltime_data pCmd = default; var data = (byte[])Msg.dwParam1; pCmd.count = GPDataTypeHelper.FromBytes(data, 0); From 0884ae338f837242f2d12d06275171799f11c5e1 Mon Sep 17 00:00:00 2001 From: VDH Date: Wed, 7 Jan 2026 18:30:57 +0700 Subject: [PATCH 02/22] convert skill --- .../Prefab/UI/Canvas_Skill.prefab | 288 +++++++++++++++++- .../Scripts/Managers/CECManager.cs | 1 + Assets/PerfectWorld/Scripts/Skills/skill.cs | 2 + Assets/PerfectWorld/Scripts/Skills/skill1.cs | 18 +- Assets/PerfectWorld/Scripts/Skills/skill10.cs | 14 +- .../PerfectWorld/Scripts/Skills/skill100.cs | 14 +- .../PerfectWorld/Scripts/Skills/skill101.cs | 14 +- .../PerfectWorld/Scripts/Skills/skill1195.cs | 10 +- .../PerfectWorld/Scripts/Skills/skill176.cs | 34 ++- .../PerfectWorld/Scripts/Skills/skill177.cs | 39 ++- .../PerfectWorld/Scripts/Skills/skill178.cs | 39 ++- .../PerfectWorld/Scripts/Skills/skill179.cs | 39 ++- .../PerfectWorld/Scripts/Skills/skill180.cs | 14 +- .../PerfectWorld/Scripts/Skills/skill1805.cs | 16 +- .../PerfectWorld/Scripts/Skills/skill1806.cs | 16 +- .../PerfectWorld/Scripts/Skills/skill1807.cs | 16 +- .../PerfectWorld/Scripts/Skills/skill1808.cs | 16 +- .../PerfectWorld/Scripts/Skills/skill1809.cs | 16 +- .../PerfectWorld/Scripts/Skills/skill181.cs | 14 +- .../PerfectWorld/Scripts/Skills/skill1815.cs | 16 +- .../PerfectWorld/Scripts/Skills/skill1816.cs | 16 +- .../PerfectWorld/Scripts/Skills/skill1817.cs | 16 +- .../PerfectWorld/Scripts/Skills/skill1818.cs | 16 +- .../PerfectWorld/Scripts/Skills/skill1819.cs | 16 +- .../PerfectWorld/Scripts/Skills/skill182.cs | 14 +- .../PerfectWorld/Scripts/Skills/skill183.cs | 14 +- .../PerfectWorld/Scripts/Skills/skill184.cs | 14 +- .../PerfectWorld/Scripts/Skills/skill1864.cs | 8 +- .../PerfectWorld/Scripts/Skills/skill1865.cs | 16 +- .../PerfectWorld/Scripts/Skills/skill1868.cs | 8 +- .../PerfectWorld/Scripts/Skills/skill187.cs | 13 +- .../PerfectWorld/Scripts/Skills/skill1871.cs | 16 +- .../PerfectWorld/Scripts/Skills/skill1872.cs | 8 +- .../PerfectWorld/Scripts/Skills/skill1873.cs | 16 +- .../PerfectWorld/Scripts/Skills/skill1874.cs | 16 +- .../PerfectWorld/Scripts/Skills/skill1951.cs | 12 +- Assets/PerfectWorld/Scripts/Skills/skill2.cs | 37 ++- .../PerfectWorld/Scripts/Skills/skill2206.cs | 16 +- .../PerfectWorld/Scripts/Skills/skill2207.cs | 16 +- .../PerfectWorld/Scripts/Skills/skill2208.cs | 16 +- .../PerfectWorld/Scripts/Skills/skill2209.cs | 16 +- .../PerfectWorld/Scripts/Skills/skill2210.cs | 16 +- .../PerfectWorld/Scripts/Skills/skill2211.cs | 16 +- .../PerfectWorld/Scripts/Skills/skill2254.cs | 16 +- .../PerfectWorld/Scripts/Skills/skill2255.cs | 16 +- .../PerfectWorld/Scripts/Skills/skill2256.cs | 16 +- .../PerfectWorld/Scripts/Skills/skill2257.cs | 16 +- .../PerfectWorld/Scripts/Skills/skill2258.cs | 16 +- .../PerfectWorld/Scripts/Skills/skill2259.cs | 16 +- .../PerfectWorld/Scripts/Skills/skill226.cs | 36 ++- .../PerfectWorld/Scripts/Skills/skill2260.cs | 16 +- .../PerfectWorld/Scripts/Skills/skill2261.cs | 16 +- .../PerfectWorld/Scripts/Skills/skill2262.cs | 16 +- .../PerfectWorld/Scripts/Skills/skill2263.cs | 16 +- .../PerfectWorld/Scripts/Skills/skill2264.cs | 16 +- .../PerfectWorld/Scripts/Skills/skill2265.cs | 16 +- .../PerfectWorld/Scripts/Skills/skill227.cs | 36 ++- .../PerfectWorld/Scripts/Skills/skill228.cs | 14 +- .../PerfectWorld/Scripts/Skills/skill229.cs | 14 +- .../PerfectWorld/Scripts/Skills/skill2352.cs | 16 +- .../PerfectWorld/Scripts/Skills/skill2367.cs | 16 +- .../PerfectWorld/Scripts/Skills/skill2368.cs | 16 +- .../PerfectWorld/Scripts/Skills/skill2369.cs | 16 +- .../PerfectWorld/Scripts/Skills/skill2370.cs | 16 +- .../PerfectWorld/Scripts/Skills/skill2371.cs | 16 +- .../PerfectWorld/Scripts/Skills/skill2372.cs | 16 +- .../PerfectWorld/Scripts/Skills/skill2373.cs | 16 +- .../PerfectWorld/Scripts/Skills/skill2374.cs | 16 +- .../PerfectWorld/Scripts/Skills/skill2375.cs | 16 +- .../PerfectWorld/Scripts/Skills/skill2452.cs | 16 +- .../PerfectWorld/Scripts/Skills/skill2453.cs | 16 +- Assets/PerfectWorld/Scripts/Skills/skill3.cs | 32 +- .../PerfectWorld/Scripts/Skills/skill362.cs | 36 ++- .../PerfectWorld/Scripts/Skills/skill363.cs | 36 ++- .../PerfectWorld/Scripts/Skills/skill364.cs | 14 +- .../PerfectWorld/Scripts/Skills/skill365.cs | 14 +- .../PerfectWorld/Scripts/Skills/skill374.cs | 38 ++- .../PerfectWorld/Scripts/Skills/skill375.cs | 33 +- .../PerfectWorld/Scripts/Skills/skill376.cs | 40 ++- .../PerfectWorld/Scripts/Skills/skill377.cs | 40 ++- .../PerfectWorld/Scripts/Skills/skill378.cs | 33 +- .../PerfectWorld/Scripts/Skills/skill379.cs | 38 ++- .../PerfectWorld/Scripts/Skills/skill380.cs | 38 ++- .../PerfectWorld/Scripts/Skills/skill381.cs | 38 ++- .../PerfectWorld/Scripts/Skills/skill382.cs | 33 +- .../PerfectWorld/Scripts/Skills/skill383.cs | 33 +- .../PerfectWorld/Scripts/Skills/skill384.cs | 38 ++- .../PerfectWorld/Scripts/Skills/skill385.cs | 38 ++- .../PerfectWorld/Scripts/Skills/skill386.cs | 35 ++- .../PerfectWorld/Scripts/Skills/skill387.cs | 35 ++- .../PerfectWorld/Scripts/Skills/skill388.cs | 35 ++- .../PerfectWorld/Scripts/Skills/skill389.cs | 40 ++- .../PerfectWorld/Scripts/Skills/skill390.cs | 39 +-- .../PerfectWorld/Scripts/Skills/skill391.cs | 16 +- .../PerfectWorld/Scripts/Skills/skill392.cs | 16 +- .../PerfectWorld/Scripts/Skills/skill393.cs | 16 +- .../PerfectWorld/Scripts/Skills/skill394.cs | 16 +- .../PerfectWorld/Scripts/Skills/skill395.cs | 16 +- .../PerfectWorld/Scripts/Skills/skill396.cs | 16 +- .../PerfectWorld/Scripts/Skills/skill397.cs | 16 +- .../PerfectWorld/Scripts/Skills/skill398.cs | 16 +- .../PerfectWorld/Scripts/Skills/skill399.cs | 16 +- Assets/PerfectWorld/Scripts/Skills/skill4.cs | 34 ++- .../PerfectWorld/Scripts/Skills/skill400.cs | 16 +- .../PerfectWorld/Scripts/Skills/skill401.cs | 16 +- .../PerfectWorld/Scripts/Skills/skill402.cs | 16 +- .../PerfectWorld/Scripts/Skills/skill403.cs | 16 +- .../PerfectWorld/Scripts/Skills/skill404.cs | 16 +- .../PerfectWorld/Scripts/Skills/skill405.cs | 16 +- .../PerfectWorld/Scripts/Skills/skill406.cs | 16 +- .../PerfectWorld/Scripts/Skills/skill407.cs | 16 +- .../PerfectWorld/Scripts/Skills/skill408.cs | 16 +- .../PerfectWorld/Scripts/Skills/skill409.cs | 16 +- .../PerfectWorld/Scripts/Skills/skill410.cs | 16 +- .../PerfectWorld/Scripts/Skills/skill411.cs | 16 +- .../PerfectWorld/Scripts/Skills/skill412.cs | 16 +- .../PerfectWorld/Scripts/Skills/skill413.cs | 16 +- .../PerfectWorld/Scripts/Skills/skill414.cs | 16 +- .../PerfectWorld/Scripts/Skills/skill415.cs | 16 +- .../PerfectWorld/Scripts/Skills/skill416.cs | 16 +- .../PerfectWorld/Scripts/Skills/skill417.cs | 16 +- .../PerfectWorld/Scripts/Skills/skill418.cs | 16 +- .../PerfectWorld/Scripts/Skills/skill419.cs | 16 +- .../PerfectWorld/Scripts/Skills/skill420.cs | 16 +- .../PerfectWorld/Scripts/Skills/skill421.cs | 16 +- .../PerfectWorld/Scripts/Skills/skill422.cs | 16 +- .../PerfectWorld/Scripts/Skills/skill423.cs | 16 +- .../PerfectWorld/Scripts/Skills/skill424.cs | 16 +- .../PerfectWorld/Scripts/Skills/skill425.cs | 16 +- .../PerfectWorld/Scripts/Skills/skill426.cs | 16 +- .../PerfectWorld/Scripts/Skills/skill427.cs | 16 +- .../PerfectWorld/Scripts/Skills/skill428.cs | 16 +- .../PerfectWorld/Scripts/Skills/skill429.cs | 16 +- .../PerfectWorld/Scripts/Skills/skill430.cs | 16 +- .../PerfectWorld/Scripts/Skills/skill431.cs | 16 +- .../PerfectWorld/Scripts/Skills/skill432.cs | 16 +- .../PerfectWorld/Scripts/Skills/skill433.cs | 16 +- .../PerfectWorld/Scripts/Skills/skill434.cs | 16 +- .../PerfectWorld/Scripts/Skills/skill435.cs | 16 +- .../PerfectWorld/Scripts/Skills/skill436.cs | 16 +- .../PerfectWorld/Scripts/Skills/skill437.cs | 16 +- .../PerfectWorld/Scripts/Skills/skill438.cs | 16 +- .../PerfectWorld/Scripts/Skills/skill439.cs | 16 +- .../PerfectWorld/Scripts/Skills/skill440.cs | 16 +- .../PerfectWorld/Scripts/Skills/skill441.cs | 16 +- .../PerfectWorld/Scripts/Skills/skill442.cs | 16 +- .../PerfectWorld/Scripts/Skills/skill443.cs | 16 +- .../PerfectWorld/Scripts/Skills/skill444.cs | 16 +- .../PerfectWorld/Scripts/Skills/skill445.cs | 16 +- .../PerfectWorld/Scripts/Skills/skill446.cs | 16 +- .../PerfectWorld/Scripts/Skills/skill447.cs | 16 +- .../PerfectWorld/Scripts/Skills/skill448.cs | 16 +- .../PerfectWorld/Scripts/Skills/skill449.cs | 16 +- .../PerfectWorld/Scripts/Skills/skill450.cs | 16 +- .../PerfectWorld/Scripts/Skills/skill451.cs | 16 +- .../PerfectWorld/Scripts/Skills/skill452.cs | 16 +- .../PerfectWorld/Scripts/Skills/skill453.cs | 16 +- .../PerfectWorld/Scripts/Skills/skill454.cs | 16 +- .../PerfectWorld/Scripts/Skills/skill455.cs | 16 +- .../PerfectWorld/Scripts/Skills/skill456.cs | 16 +- .../PerfectWorld/Scripts/Skills/skill457.cs | 16 +- .../PerfectWorld/Scripts/Skills/skill458.cs | 16 +- .../PerfectWorld/Scripts/Skills/skill459.cs | 16 +- .../PerfectWorld/Scripts/Skills/skill460.cs | 16 +- .../PerfectWorld/Scripts/Skills/skill461.cs | 16 +- .../PerfectWorld/Scripts/Skills/skill462.cs | 16 +- .../PerfectWorld/Scripts/Skills/skill463.cs | 16 +- .../PerfectWorld/Scripts/Skills/skill464.cs | 16 +- .../PerfectWorld/Scripts/Skills/skill465.cs | 16 +- .../PerfectWorld/Scripts/Skills/skill466.cs | 16 +- .../PerfectWorld/Scripts/Skills/skill467.cs | 16 +- .../PerfectWorld/Scripts/Skills/skill468.cs | 16 +- .../PerfectWorld/Scripts/Skills/skill469.cs | 16 +- .../PerfectWorld/Scripts/Skills/skill470.cs | 16 +- .../PerfectWorld/Scripts/Skills/skill471.cs | 16 +- .../PerfectWorld/Scripts/Skills/skill472.cs | 16 +- .../PerfectWorld/Scripts/Skills/skill473.cs | 16 +- .../PerfectWorld/Scripts/Skills/skill474.cs | 16 +- .../PerfectWorld/Scripts/Skills/skill475.cs | 16 +- .../PerfectWorld/Scripts/Skills/skill476.cs | 16 +- .../PerfectWorld/Scripts/Skills/skill477.cs | 16 +- .../PerfectWorld/Scripts/Skills/skill478.cs | 16 +- .../PerfectWorld/Scripts/Skills/skill479.cs | 16 +- .../PerfectWorld/Scripts/Skills/skill480.cs | 16 +- .../PerfectWorld/Scripts/Skills/skill481.cs | 16 +- .../PerfectWorld/Scripts/Skills/skill482.cs | 16 +- .../PerfectWorld/Scripts/Skills/skill483.cs | 16 +- .../PerfectWorld/Scripts/Skills/skill484.cs | 16 +- .../PerfectWorld/Scripts/Skills/skill485.cs | 16 +- .../PerfectWorld/Scripts/Skills/skill486.cs | 16 +- .../PerfectWorld/Scripts/Skills/skill487.cs | 16 +- .../PerfectWorld/Scripts/Skills/skill488.cs | 16 +- .../PerfectWorld/Scripts/Skills/skill489.cs | 16 +- .../PerfectWorld/Scripts/Skills/skill490.cs | 16 +- .../PerfectWorld/Scripts/Skills/skill491.cs | 16 +- Assets/PerfectWorld/Scripts/Skills/skill5.cs | 27 +- Assets/PerfectWorld/Scripts/Skills/skill53.cs | 14 +- Assets/PerfectWorld/Scripts/Skills/skill54.cs | 34 ++- Assets/PerfectWorld/Scripts/Skills/skill55.cs | 34 ++- Assets/PerfectWorld/Scripts/Skills/skill56.cs | 34 ++- Assets/PerfectWorld/Scripts/Skills/skill57.cs | 32 +- Assets/PerfectWorld/Scripts/Skills/skill58.cs | 39 ++- Assets/PerfectWorld/Scripts/Skills/skill59.cs | 39 ++- Assets/PerfectWorld/Scripts/Skills/skill6.cs | 15 +- Assets/PerfectWorld/Scripts/Skills/skill60.cs | 28 +- Assets/PerfectWorld/Scripts/Skills/skill61.cs | 33 +- Assets/PerfectWorld/Scripts/Skills/skill62.cs | 30 +- Assets/PerfectWorld/Scripts/Skills/skill63.cs | 30 +- Assets/PerfectWorld/Scripts/Skills/skill64.cs | 29 +- Assets/PerfectWorld/Scripts/Skills/skill65.cs | 22 +- Assets/PerfectWorld/Scripts/Skills/skill66.cs | 29 +- Assets/PerfectWorld/Scripts/Skills/skill67.cs | 29 +- Assets/PerfectWorld/Scripts/Skills/skill68.cs | 27 +- Assets/PerfectWorld/Scripts/Skills/skill69.cs | 29 +- Assets/PerfectWorld/Scripts/Skills/skill7.cs | 53 +--- Assets/PerfectWorld/Scripts/Skills/skill70.cs | 24 +- Assets/PerfectWorld/Scripts/Skills/skill71.cs | 29 +- Assets/PerfectWorld/Scripts/Skills/skill72.cs | 27 +- Assets/PerfectWorld/Scripts/Skills/skill73.cs | 22 +- Assets/PerfectWorld/Scripts/Skills/skill74.cs | 27 +- Assets/PerfectWorld/Scripts/Skills/skill75.cs | 29 +- Assets/PerfectWorld/Scripts/Skills/skill76.cs | 39 ++- Assets/PerfectWorld/Scripts/Skills/skill77.cs | 39 ++- Assets/PerfectWorld/Scripts/Skills/skill78.cs | 15 +- Assets/PerfectWorld/Scripts/Skills/skill79.cs | 15 +- Assets/PerfectWorld/Scripts/Skills/skill8.cs | 50 +-- Assets/PerfectWorld/Scripts/Skills/skill80.cs | 15 +- Assets/PerfectWorld/Scripts/Skills/skill81.cs | 14 +- Assets/PerfectWorld/Scripts/Skills/skill84.cs | 14 +- Assets/PerfectWorld/Scripts/Skills/skill85.cs | 14 +- Assets/PerfectWorld/Scripts/Skills/skill86.cs | 14 +- Assets/PerfectWorld/Scripts/Skills/skill87.cs | 14 +- Assets/PerfectWorld/Scripts/Skills/skill88.cs | 14 +- Assets/PerfectWorld/Scripts/Skills/skill89.cs | 14 +- .../PerfectWorld/Scripts/Skills/skill896.cs | 16 +- .../PerfectWorld/Scripts/Skills/skill897.cs | 16 +- .../PerfectWorld/Scripts/Skills/skill898.cs | 16 +- .../PerfectWorld/Scripts/Skills/skill899.cs | 16 +- Assets/PerfectWorld/Scripts/Skills/skill9.cs | 40 +-- Assets/PerfectWorld/Scripts/Skills/skill90.cs | 14 +- .../PerfectWorld/Scripts/Skills/skill900.cs | 16 +- .../PerfectWorld/Scripts/Skills/skill901.cs | 16 +- .../PerfectWorld/Scripts/Skills/skill902.cs | 16 +- .../PerfectWorld/Scripts/Skills/skill903.cs | 16 +- .../PerfectWorld/Scripts/Skills/skill904.cs | 16 +- .../PerfectWorld/Scripts/Skills/skill905.cs | 16 +- Assets/PerfectWorld/Scripts/Skills/skill91.cs | 14 +- Assets/PerfectWorld/Scripts/Skills/skill92.cs | 14 +- .../PerfectWorld/Scripts/Skills/skill923.cs | 16 +- .../PerfectWorld/Scripts/Skills/skill924.cs | 16 +- .../PerfectWorld/Scripts/Skills/skill925.cs | 16 +- .../PerfectWorld/Scripts/Skills/skill926.cs | 16 +- Assets/PerfectWorld/Scripts/Skills/skill93.cs | 14 +- Assets/PerfectWorld/Scripts/Skills/skill94.cs | 8 +- Assets/PerfectWorld/Scripts/Skills/skill95.cs | 8 +- Assets/PerfectWorld/Scripts/Skills/skill96.cs | 14 +- Assets/PerfectWorld/Scripts/Skills/skill97.cs | 14 +- Assets/PerfectWorld/Scripts/Skills/skill98.cs | 14 +- Assets/PerfectWorld/Scripts/Skills/skill99.cs | 14 +- .../Scripts/UI/Dialogs/CDlgSkillSubList.cs | 8 +- .../UI/GamePlay/SkillUI/AUISubDialog.cs | 8 +- Assets/PerfectWorld/Scripts/skill2.cs | 171 ----------- Assets/Prefabs/BoostrapForTest.prefab | 4 +- Assets/Prefabs/UI/SkillUI.prefab | 143 ++++++++- Assets/Scenes/a61.unity | 4 +- 265 files changed, 3121 insertions(+), 2523 deletions(-) delete mode 100644 Assets/PerfectWorld/Scripts/skill2.cs diff --git a/Assets/PerfectWorld/Prefab/UI/Canvas_Skill.prefab b/Assets/PerfectWorld/Prefab/UI/Canvas_Skill.prefab index 36cabbf633..5172617c54 100644 --- a/Assets/PerfectWorld/Prefab/UI/Canvas_Skill.prefab +++ b/Assets/PerfectWorld/Prefab/UI/Canvas_Skill.prefab @@ -55,6 +55,139 @@ MonoBehaviour: - {fileID: 473551792621656190} - {fileID: 386805116814525131} - {fileID: 6898229972725535650} +--- !u!1 &965564150175367737 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2946975800764706429} + - component: {fileID: 4171085597288328847} + - component: {fileID: 6695258280477469512} + - component: {fileID: 8319868490910887608} + m_Layer: 5 + m_Name: ButtonToggleSkill + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2946975800764706429 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 965564150175367737} + 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: + - {fileID: 1848604417580262094} + m_Father: {fileID: 8078455359151753464} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 1, y: 0.5} + m_AnchorMax: {x: 1, y: 0.5} + m_AnchoredPosition: {x: -151.79999, y: 309.8} + m_SizeDelta: {x: 81.9939, y: 49.1664} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &4171085597288328847 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 965564150175367737} + m_CullTransparentMesh: 1 +--- !u!114 &6695258280477469512 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 965564150175367737} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!114 &8319868490910887608 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 965564150175367737} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_WrapAround: 0 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 6695258280477469512} + m_OnClick: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 0} + m_TargetAssemblyTypeName: UnityEngine.GameObject, UnityEngine + m_MethodName: SetActive + m_Mode: 6 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 1 + m_CallState: 2 --- !u!1 &5713000252331107611 GameObject: m_ObjectHideFlags: 0 @@ -87,6 +220,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1608209508545832950} + - {fileID: 2946975800764706429} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} @@ -157,6 +291,144 @@ MonoBehaviour: m_BlockingMask: serializedVersion: 2 m_Bits: 4294967295 +--- !u!1 &6124355795601613977 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1848604417580262094} + - component: {fileID: 5504953265477448813} + - component: {fileID: 3464888604336739725} + m_Layer: 5 + m_Name: Text (TMP) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1848604417580262094 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6124355795601613977} + 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: 2946975800764706429} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &5504953265477448813 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6124355795601613977} + m_CullTransparentMesh: 1 +--- !u!114 &3464888604336739725 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6124355795601613977} + 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: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_text: 'Skill + +' + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4281479730 + m_fontColor: {r: 0.19607843, g: 0.19607843, b: 0.19607843, 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: 24 + m_fontSizeBase: 24 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 2 + m_VerticalAlignment: 512 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_TextWrappingMode: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 0 + m_ActiveFontFeatures: 6e72656b + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_EmojiFallbackSupport: 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!1001 &2685853672127006524 PrefabInstance: m_ObjectHideFlags: 0 @@ -169,6 +441,10 @@ PrefabInstance: propertyPath: m_Name value: ButtonSkill1 objectReference: {fileID: 0} + - target: {fileID: 4284393271722921544, guid: 8586a375545487f43b57c6ffdce6fbfd, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} - target: {fileID: 5717981154351234976, guid: 8586a375545487f43b57c6ffdce6fbfd, type: 3} propertyPath: m_Pivot.x value: 0.5 @@ -288,7 +564,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4284393271722921544, guid: 8586a375545487f43b57c6ffdce6fbfd, type: 3} propertyPath: m_IsActive - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 5717981154351234976, guid: 8586a375545487f43b57c6ffdce6fbfd, type: 3} propertyPath: m_Pivot.x @@ -352,11 +628,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5717981154351234976, guid: 8586a375545487f43b57c6ffdce6fbfd, type: 3} propertyPath: m_AnchoredPosition.x - value: 390 + value: 269 objectReference: {fileID: 0} - target: {fileID: 5717981154351234976, guid: 8586a375545487f43b57c6ffdce6fbfd, type: 3} propertyPath: m_AnchoredPosition.y - value: -232 + value: -156 objectReference: {fileID: 0} - target: {fileID: 5717981154351234976, guid: 8586a375545487f43b57c6ffdce6fbfd, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -409,7 +685,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4284393271722921544, guid: 8586a375545487f43b57c6ffdce6fbfd, type: 3} propertyPath: m_IsActive - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 5717981154351234976, guid: 8586a375545487f43b57c6ffdce6fbfd, type: 3} propertyPath: m_Pivot.x @@ -473,11 +749,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5717981154351234976, guid: 8586a375545487f43b57c6ffdce6fbfd, type: 3} propertyPath: m_AnchoredPosition.x - value: 613 + value: 485 objectReference: {fileID: 0} - target: {fileID: 5717981154351234976, guid: 8586a375545487f43b57c6ffdce6fbfd, type: 3} propertyPath: m_AnchoredPosition.y - value: -134 + value: -12 objectReference: {fileID: 0} - target: {fileID: 5717981154351234976, guid: 8586a375545487f43b57c6ffdce6fbfd, type: 3} propertyPath: m_LocalEulerAnglesHint.x diff --git a/Assets/PerfectWorld/Scripts/Managers/CECManager.cs b/Assets/PerfectWorld/Scripts/Managers/CECManager.cs index e51446f972..541c4adc79 100644 --- a/Assets/PerfectWorld/Scripts/Managers/CECManager.cs +++ b/Assets/PerfectWorld/Scripts/Managers/CECManager.cs @@ -157,5 +157,6 @@ namespace BrewMonster.Managers + diff --git a/Assets/PerfectWorld/Scripts/Skills/skill.cs b/Assets/PerfectWorld/Scripts/Skills/skill.cs index 206330d216..a43e03158a 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill.cs @@ -208,6 +208,7 @@ namespace BrewMonster.Scripts.Skills #endif public SkillStub(uint i) { + BMLogger.LogError("SkillStub Constructor id=" + i); id = i; is_inherent = (false); is_movingcast = (false); @@ -217,6 +218,7 @@ namespace BrewMonster.Scripts.Skills combosk_nobreak = (0); if (GetStub(id) == null) { + BMLogger.LogError("SkillStub Add to Map id=" + id); GetMap().Add(id, this); } } diff --git a/Assets/PerfectWorld/Scripts/Skills/skill1.cs b/Assets/PerfectWorld/Scripts/Skills/skill1.cs index 7fd3898b69..e3bd2beea0 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill1.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill1.cs @@ -84,9 +84,9 @@ namespace BrewMonster public Skill1Stub() : base(1) { cls = 0; - name = ""; - nativename = ""; - icon = ".dds"; + name = "虎击"; + nativename = "虎击"; + icon = "虎击.dds"; max_level = 10; type = 1; apcost = 0; @@ -107,12 +107,17 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = ""; + effect = "虎击.sgc"; doenchant = 0; dobless = 0; commoncooldown = 0; commoncooldowntime = 0; restrict_weapons.Add(0); + restrict_weapons.Add(1); + restrict_weapons.Add(182); + restrict_weapons.Add(5); + restrict_weapons.Add(292); + restrict_weapons.Add(9); range = new Range(); range.type = 0; #if SKILL_SERVER @@ -138,7 +143,10 @@ namespace BrewMonster #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) { - string result = string.Format(format, skill.GetLevel(), -5 + 7 * skill.GetLevel(), 1.9 * skill.GetLevel() * skill.GetLevel() + 64 * skill.GetLevel() + 36.7); + string result = string.Format(format, + skill.GetLevel(), + -5 + 7 * skill.GetLevel(), + 1.9 * skill.GetLevel() * skill.GetLevel() + 64 * skill.GetLevel() + 36.7); if (result.Length < length) { buffer.Append(result); diff --git a/Assets/PerfectWorld/Scripts/Skills/skill10.cs b/Assets/PerfectWorld/Scripts/Skills/skill10.cs index d147146427..b73cde784a 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill10.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill10.cs @@ -127,16 +127,16 @@ namespace BrewMonster ~Skill10Stub() { } - public float GetMpcost(Skill skill) => (float)(50.4 + 18 * skill.GetLevel()); - public int GetExecutetime(Skill skill) => 1000; - public int GetCoolingtime(Skill skill) => 8000; + public override float GetMpcost(Skill skill) => (float)(50.4 + 18 * skill.GetLevel()); + public override int GetExecutetime(Skill skill) => 1000; + public override int GetCoolingtime(Skill skill) => 8000; public float GetRadius(Skill skill) => 0f; public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => (float)(19.5 + 0.9 * skill.GetLevel()); - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => (float)(19.5 + 0.9 * skill.GetLevel()); + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) diff --git a/Assets/PerfectWorld/Scripts/Skills/skill100.cs b/Assets/PerfectWorld/Scripts/Skills/skill100.cs index 2b0626c598..42ca306b50 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill100.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill100.cs @@ -122,16 +122,16 @@ namespace BrewMonster ~Skill100Stub() { } - public float GetMpcost(Skill skill) => 50f; - public int GetExecutetime(Skill skill) => 1000; - public int GetCoolingtime(Skill skill) => 20000 - 1000 * skill.GetLevel(); + public override float GetMpcost(Skill skill) => 50f; + public override int GetExecutetime(Skill skill) => 1000; + public override int GetCoolingtime(Skill skill) => 20000 - 1000 * skill.GetLevel(); public float GetRadius(Skill skill) => (float)(2 + 0.3 * skill.GetLevel()); public float GetAttackdistance(Skill skill) => (float)(4 + 0.4 * skill.GetLevel()); public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => (float)(15 + skill.GetLevel()); - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => (float)(15 + skill.GetLevel()); + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) diff --git a/Assets/PerfectWorld/Scripts/Skills/skill101.cs b/Assets/PerfectWorld/Scripts/Skills/skill101.cs index e4bc30c93d..f463ba283b 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill101.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill101.cs @@ -65,16 +65,16 @@ namespace BrewMonster ~Skill101Stub() { } - public float GetMpcost(Skill skill) => 0f; - public int GetExecutetime(Skill skill) => 0; - public int GetCoolingtime(Skill skill) => 0; + public override float GetMpcost(Skill skill) => 0f; + public override int GetExecutetime(Skill skill) => 0; + public override int GetCoolingtime(Skill skill) => 0; public float GetRadius(Skill skill) => 0f; public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => 0f; - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => 0f; + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) diff --git a/Assets/PerfectWorld/Scripts/Skills/skill1195.cs b/Assets/PerfectWorld/Scripts/Skills/skill1195.cs index 2db2d23116..f586c4425c 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill1195.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill1195.cs @@ -124,14 +124,14 @@ namespace BrewMonster ~Skill1195Stub() { } - public float GetMpcost(Skill skill) => (float)(10 + 5 * skill.GetLevel()); - public int GetExecutetime(Skill skill) => 1200; - public int GetCoolingtime(Skill skill) => 8000; + public override float GetMpcost(Skill skill) => (float)(10 + 5 * skill.GetLevel()); + public override int GetExecutetime(Skill skill) => 1200; + public override int GetCoolingtime(Skill skill) => 8000; public float GetRadius(Skill skill) => 0f; public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => (float)(skill.GetPlayer().GetRange()); - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => (float)(skill.GetPlayer().GetRange()); + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) diff --git a/Assets/PerfectWorld/Scripts/Skills/skill176.cs b/Assets/PerfectWorld/Scripts/Skills/skill176.cs index a90f0a5133..fd26966e0b 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill176.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill176.cs @@ -70,10 +70,21 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; + effect = "凌波微步.sgc"; + doenchant = 1; + dobless = 0; + commoncooldown = 0; + commoncooldowntime = 0; restrict_weapons.Add(0); - effect = ""; + restrict_weapons.Add(1); + restrict_weapons.Add(182); + restrict_weapons.Add(5); + restrict_weapons.Add(292); + restrict_weapons.Add(9); range = new Range(); - range.type = 0; + range.type = 5; + pre_skills = new Dictionary(); + pre_skills.Add(76, 10); #if SKILL_SERVER statestub.Add(new State1()); #endif @@ -81,23 +92,20 @@ namespace BrewMonster ~Skill176Stub() { } - public float GetMpcost(Skill skill) => 100f; - public int GetExecutetime(Skill skill) => 0; - public int GetCoolingtime(Skill skill) => 60000; + public override float GetMpcost(Skill skill) => 100f; + public override int GetExecutetime(Skill skill) => 0; + public override int GetCoolingtime(Skill skill) => 60000; public float GetRadius(Skill skill) => 0f; public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => 0f; - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => 0f; + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_SERVER public int GetEnmity(Skill skill) => 0; - public bool StateAttack(Skill skill) - { - return true; - } + public bool StateAttack(Skill skill) => true; public bool TakeEffect(Skill skill) => true; public float GetEffectdistance(Skill skill) => 5f; public float GetHitrate(Skill skill) => 0f; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill177.cs b/Assets/PerfectWorld/Scripts/Skills/skill177.cs index 6d02351c53..37b8e169cd 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill177.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill177.cs @@ -70,10 +70,21 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; + effect = "易筋经.sgc"; + doenchant = 1; + dobless = 0; + commoncooldown = 0; + commoncooldowntime = 0; restrict_weapons.Add(0); - effect = ""; + restrict_weapons.Add(1); + restrict_weapons.Add(182); + restrict_weapons.Add(5); + restrict_weapons.Add(292); + restrict_weapons.Add(9); range = new Range(); - range.type = 0; + range.type = 5; + pre_skills = new Dictionary(); + pre_skills.Add(0, 1); #if SKILL_SERVER statestub.Add(new State1()); #endif @@ -81,21 +92,24 @@ namespace BrewMonster ~Skill177Stub() { } - public float GetMpcost(Skill skill) => 20f; - public int GetExecutetime(Skill skill) => 0; - public int GetCoolingtime(Skill skill) => 10000; + public override float GetMpcost(Skill skill) => 20f; + public override int GetExecutetime(Skill skill) => 0; + public override int GetCoolingtime(Skill skill) => 10000; public float GetRadius(Skill skill) => 0f; public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => 0f; - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => 0f; + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) { - string result = string.Format(format, skill.GetLevel(), 20 + 10 * skill.GetLevel(), 20 + 10 * skill.GetLevel()); + string result = string.Format(format, + skill.GetLevel(), + 20 + 10 * skill.GetLevel(), + 20 + 10 * skill.GetLevel()); if (result.Length < length) { buffer.Append(result); @@ -107,10 +121,7 @@ namespace BrewMonster #if SKILL_SERVER public int GetEnmity(Skill skill) => 0; - public bool StateAttack(Skill skill) - { - return true; - } + public bool StateAttack(Skill skill) => true; public bool TakeEffect(Skill skill) => true; public float GetEffectdistance(Skill skill) => 5f; public float GetHitrate(Skill skill) => 0f; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill178.cs b/Assets/PerfectWorld/Scripts/Skills/skill178.cs index c8f1c668b8..e24ff4fee5 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill178.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill178.cs @@ -70,10 +70,21 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; + effect = "易髓经.sgc"; + doenchant = 1; + dobless = 0; + commoncooldown = 0; + commoncooldowntime = 0; restrict_weapons.Add(0); - effect = ""; + restrict_weapons.Add(1); + restrict_weapons.Add(182); + restrict_weapons.Add(5); + restrict_weapons.Add(292); + restrict_weapons.Add(9); range = new Range(); - range.type = 0; + range.type = 5; + pre_skills = new Dictionary(); + pre_skills.Add(177, 1); #if SKILL_SERVER statestub.Add(new State1()); #endif @@ -81,21 +92,24 @@ namespace BrewMonster ~Skill178Stub() { } - public float GetMpcost(Skill skill) => 20f; - public int GetExecutetime(Skill skill) => 0; - public int GetCoolingtime(Skill skill) => 10000; + public override float GetMpcost(Skill skill) => 20f; + public override int GetExecutetime(Skill skill) => 0; + public override int GetCoolingtime(Skill skill) => 10000; public float GetRadius(Skill skill) => 0f; public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => 0f; - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => 0f; + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) { - string result = string.Format(format, skill.GetLevel(), 20 + 10 * skill.GetLevel(), 20 + 10 * skill.GetLevel()); + string result = string.Format(format, + skill.GetLevel(), + 20 + 10 * skill.GetLevel(), + 20 + 10 * skill.GetLevel()); if (result.Length < length) { buffer.Append(result); @@ -107,10 +121,7 @@ namespace BrewMonster #if SKILL_SERVER public int GetEnmity(Skill skill) => 0; - public bool StateAttack(Skill skill) - { - return true; - } + public bool StateAttack(Skill skill) => true; public bool TakeEffect(Skill skill) => true; public float GetEffectdistance(Skill skill) => 5f; public float GetHitrate(Skill skill) => 0f; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill179.cs b/Assets/PerfectWorld/Scripts/Skills/skill179.cs index 933bc50113..462e4ec119 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill179.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill179.cs @@ -70,10 +70,21 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; + effect = "金刚经.sgc"; + doenchant = 1; + dobless = 0; + commoncooldown = 0; + commoncooldowntime = 0; restrict_weapons.Add(0); - effect = ""; + restrict_weapons.Add(1); + restrict_weapons.Add(182); + restrict_weapons.Add(5); + restrict_weapons.Add(292); + restrict_weapons.Add(9); range = new Range(); - range.type = 0; + range.type = 5; + pre_skills = new Dictionary(); + pre_skills.Add(0, 1); #if SKILL_SERVER statestub.Add(new State1()); #endif @@ -81,21 +92,24 @@ namespace BrewMonster ~Skill179Stub() { } - public float GetMpcost(Skill skill) => (float)(20 + 30 * skill.GetLevel()); - public int GetExecutetime(Skill skill) => 0; - public int GetCoolingtime(Skill skill) => 30000; + public override float GetMpcost(Skill skill) => (float)(20 + 30 * skill.GetLevel()); + public override int GetExecutetime(Skill skill) => 0; + public override int GetCoolingtime(Skill skill) => 30000; public float GetRadius(Skill skill) => 0f; public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => 0f; - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => 0f; + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) { - string result = string.Format(format, skill.GetLevel(), 20 + 30 * skill.GetLevel(), skill.GetLevel() * 150 + 100); + string result = string.Format(format, + skill.GetLevel(), + 20 + 30 * skill.GetLevel(), + skill.GetLevel() * 150 + 100); if (result.Length < length) { buffer.Append(result); @@ -107,10 +121,7 @@ namespace BrewMonster #if SKILL_SERVER public int GetEnmity(Skill skill) => 0; - public bool StateAttack(Skill skill) - { - return true; - } + public bool StateAttack(Skill skill) => true; public bool TakeEffect(Skill skill) => true; public float GetEffectdistance(Skill skill) => 5f; public float GetHitrate(Skill skill) => 0f; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill180.cs b/Assets/PerfectWorld/Scripts/Skills/skill180.cs index 472756781b..00dc073b4a 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill180.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill180.cs @@ -124,16 +124,16 @@ namespace BrewMonster ~Skill180Stub() { } - public float GetMpcost(Skill skill) => (float)(-6 + 15 * skill.GetLevel()); - public int GetExecutetime(Skill skill) => 1200; - public int GetCoolingtime(Skill skill) => 3000; + public override float GetMpcost(Skill skill) => (float)(-6 + 15 * skill.GetLevel()); + public override int GetExecutetime(Skill skill) => 1200; + public override int GetCoolingtime(Skill skill) => 3000; public float GetRadius(Skill skill) => 0f; public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => 0f; - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => 0f; + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) diff --git a/Assets/PerfectWorld/Scripts/Skills/skill1805.cs b/Assets/PerfectWorld/Scripts/Skills/skill1805.cs index 640bdbe0f6..ce7a647fa9 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill1805.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill1805.cs @@ -125,17 +125,17 @@ namespace BrewMonster ~Skill1805Stub() { } - public float GetMpcost(Skill skill) => 1363f; - public int GetExecutetime(Skill skill) => 1500; - public int GetCoolingtime(Skill skill) => 60000; + public override float GetMpcost(Skill skill) => 1363f; + public override int GetExecutetime(Skill skill) => 1500; + public override int GetCoolingtime(Skill skill) => 60000; public float GetRadius(Skill skill) => 0f; public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => 0f; - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => 0f; + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_SERVER public int GetEnmity(Skill skill) => 100; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill1806.cs b/Assets/PerfectWorld/Scripts/Skills/skill1806.cs index ef6f997037..68466532cc 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill1806.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill1806.cs @@ -125,17 +125,17 @@ namespace BrewMonster ~Skill1806Stub() { } - public float GetMpcost(Skill skill) => 1818f; - public int GetExecutetime(Skill skill) => 1300; - public int GetCoolingtime(Skill skill) => 120000; + public override float GetMpcost(Skill skill) => 1818f; + public override int GetExecutetime(Skill skill) => 1300; + public override int GetCoolingtime(Skill skill) => 120000; public float GetRadius(Skill skill) => 0f; public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => 0f; - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => 0f; + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_SERVER public int GetEnmity(Skill skill) => 100; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill1807.cs b/Assets/PerfectWorld/Scripts/Skills/skill1807.cs index 73cc6a5e68..a2c64be715 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill1807.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill1807.cs @@ -126,17 +126,17 @@ namespace BrewMonster ~Skill1807Stub() { } - public float GetMpcost(Skill skill) => 545f; - public int GetExecutetime(Skill skill) => 600; - public int GetCoolingtime(Skill skill) => 45000; + public override float GetMpcost(Skill skill) => 545f; + public override int GetExecutetime(Skill skill) => 600; + public override int GetCoolingtime(Skill skill) => 45000; public float GetRadius(Skill skill) => 0f; public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => 30f; - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => 30f; + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_SERVER public int GetEnmity(Skill skill) => 100; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill1808.cs b/Assets/PerfectWorld/Scripts/Skills/skill1808.cs index 29f3270e8c..7e0990f464 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill1808.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill1808.cs @@ -125,17 +125,17 @@ namespace BrewMonster ~Skill1808Stub() { } - public float GetMpcost(Skill skill) => 909f; - public int GetExecutetime(Skill skill) => 1200; - public int GetCoolingtime(Skill skill) => 90000; + public override float GetMpcost(Skill skill) => 909f; + public override int GetExecutetime(Skill skill) => 1200; + public override int GetCoolingtime(Skill skill) => 90000; public float GetRadius(Skill skill) => 0f; public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => 30f; - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => 30f; + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_SERVER public int GetEnmity(Skill skill) => 100; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill1809.cs b/Assets/PerfectWorld/Scripts/Skills/skill1809.cs index 4caf33ca7c..b16b053041 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill1809.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill1809.cs @@ -125,17 +125,17 @@ namespace BrewMonster ~Skill1809Stub() { } - public float GetMpcost(Skill skill) => 606f; - public int GetExecutetime(Skill skill) => 1900; - public int GetCoolingtime(Skill skill) => 10000; + public override float GetMpcost(Skill skill) => 606f; + public override int GetExecutetime(Skill skill) => 1900; + public override int GetCoolingtime(Skill skill) => 10000; public float GetRadius(Skill skill) => 15f; public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => 10f; - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => 10f; + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_SERVER public int GetEnmity(Skill skill) => 100; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill181.cs b/Assets/PerfectWorld/Scripts/Skills/skill181.cs index cbef6bbdbb..847f9fc6a7 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill181.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill181.cs @@ -124,16 +124,16 @@ namespace BrewMonster ~Skill181Stub() { } - public float GetMpcost(Skill skill) => (float)(12 + 15 * skill.GetLevel()); - public int GetExecutetime(Skill skill) => 1200; - public int GetCoolingtime(Skill skill) => 3000; + public override float GetMpcost(Skill skill) => (float)(12 + 15 * skill.GetLevel()); + public override int GetExecutetime(Skill skill) => 1200; + public override int GetCoolingtime(Skill skill) => 3000; public float GetRadius(Skill skill) => 0f; public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => 0f; - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => 0f; + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) diff --git a/Assets/PerfectWorld/Scripts/Skills/skill1815.cs b/Assets/PerfectWorld/Scripts/Skills/skill1815.cs index 3d9fe5cd90..0ddf0d3353 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill1815.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill1815.cs @@ -127,17 +127,17 @@ namespace BrewMonster ~Skill1815Stub() { } - public float GetMpcost(Skill skill) => 141f; - public int GetExecutetime(Skill skill) => 600; - public int GetCoolingtime(Skill skill) => 90000; + public override float GetMpcost(Skill skill) => 141f; + public override int GetExecutetime(Skill skill) => 600; + public override int GetCoolingtime(Skill skill) => 90000; public float GetRadius(Skill skill) => 0f; public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => 15f; - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => 15f; + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_SERVER public int GetEnmity(Skill skill) => 100; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill1816.cs b/Assets/PerfectWorld/Scripts/Skills/skill1816.cs index a14ebd5dd9..9a928fe613 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill1816.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill1816.cs @@ -129,17 +129,17 @@ namespace BrewMonster ~Skill1816Stub() { } - public float GetMpcost(Skill skill) => 495f; - public int GetExecutetime(Skill skill) => 1700; - public int GetCoolingtime(Skill skill) => 180000; + public override float GetMpcost(Skill skill) => 495f; + public override int GetExecutetime(Skill skill) => 1700; + public override int GetCoolingtime(Skill skill) => 180000; public float GetRadius(Skill skill) => 10f; public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => (float)(skill.GetPlayer().GetRange()); - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => (float)(skill.GetPlayer().GetRange()); + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_SERVER public int GetEnmity(Skill skill) => 100; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill1817.cs b/Assets/PerfectWorld/Scripts/Skills/skill1817.cs index 097624308f..29b6dca10c 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill1817.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill1817.cs @@ -131,17 +131,17 @@ namespace BrewMonster ~Skill1817Stub() { } - public float GetMpcost(Skill skill) => 0f; - public int GetExecutetime(Skill skill) => 850; - public int GetCoolingtime(Skill skill) => 120000; + public override float GetMpcost(Skill skill) => 0f; + public override int GetExecutetime(Skill skill) => 850; + public override int GetCoolingtime(Skill skill) => 120000; public float GetRadius(Skill skill) => 3f; public float GetAttackdistance(Skill skill) => 12f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => 10f; - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => 10f; + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_SERVER public int GetEnmity(Skill skill) => 100; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill1818.cs b/Assets/PerfectWorld/Scripts/Skills/skill1818.cs index a5fbffe346..ed352d36a2 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill1818.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill1818.cs @@ -130,17 +130,17 @@ namespace BrewMonster ~Skill1818Stub() { } - public float GetMpcost(Skill skill) => 353f; - public int GetExecutetime(Skill skill) => 900; - public int GetCoolingtime(Skill skill) => 60000; + public override float GetMpcost(Skill skill) => 353f; + public override int GetExecutetime(Skill skill) => 900; + public override int GetCoolingtime(Skill skill) => 60000; public float GetRadius(Skill skill) => 8f; public float GetAttackdistance(Skill skill) => 15f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => 25f; - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => 25f; + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_SERVER public int GetEnmity(Skill skill) => 100; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill1819.cs b/Assets/PerfectWorld/Scripts/Skills/skill1819.cs index e7a5eb0b77..6bf9dcc506 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill1819.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill1819.cs @@ -128,17 +128,17 @@ namespace BrewMonster ~Skill1819Stub() { } - public float GetMpcost(Skill skill) => 212f; - public int GetExecutetime(Skill skill) => 2000; - public int GetCoolingtime(Skill skill) => 120000; + public override float GetMpcost(Skill skill) => 212f; + public override int GetExecutetime(Skill skill) => 2000; + public override int GetCoolingtime(Skill skill) => 120000; public float GetRadius(Skill skill) => 10f; public float GetAttackdistance(Skill skill) => 15f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => 25f; - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => 25f; + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_SERVER public int GetEnmity(Skill skill) => 100; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill182.cs b/Assets/PerfectWorld/Scripts/Skills/skill182.cs index a1b673b324..a2b3a8a215 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill182.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill182.cs @@ -127,16 +127,16 @@ namespace BrewMonster ~Skill182Stub() { } - public float GetMpcost(Skill skill) => (float)(39.6 + 18 * skill.GetLevel()); - public int GetExecutetime(Skill skill) => 1200; - public int GetCoolingtime(Skill skill) => 12000; + public override float GetMpcost(Skill skill) => (float)(39.6 + 18 * skill.GetLevel()); + public override int GetExecutetime(Skill skill) => 1200; + public override int GetCoolingtime(Skill skill) => 12000; public float GetRadius(Skill skill) => (float)(4 + 0.4 * skill.GetLevel()); public float GetAttackdistance(Skill skill) => (float)(4 + 0.4 * skill.GetLevel()); public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => (float)(19.5 + 0.9 * skill.GetLevel()); - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => (float)(19.5 + 0.9 * skill.GetLevel()); + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) diff --git a/Assets/PerfectWorld/Scripts/Skills/skill183.cs b/Assets/PerfectWorld/Scripts/Skills/skill183.cs index 926e5de726..e303556109 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill183.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill183.cs @@ -87,16 +87,16 @@ namespace BrewMonster ~Skill183Stub() { } - public float GetMpcost(Skill skill) => 0f; - public int GetExecutetime(Skill skill) => 0; - public int GetCoolingtime(Skill skill) => 60000; + public override float GetMpcost(Skill skill) => 0f; + public override int GetExecutetime(Skill skill) => 0; + public override int GetCoolingtime(Skill skill) => 60000; public float GetRadius(Skill skill) => 0f; public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => 0f; - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => 0f; + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_SERVER public int GetEnmity(Skill skill) => 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill184.cs b/Assets/PerfectWorld/Scripts/Skills/skill184.cs index dba1974a92..f2491f29fd 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill184.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill184.cs @@ -124,16 +124,16 @@ namespace BrewMonster ~Skill184Stub() { } - public float GetMpcost(Skill skill) => (float)(135 + 12 * skill.GetLevel()); - public int GetExecutetime(Skill skill) => 2000; - public int GetCoolingtime(Skill skill) => 31000 - 1000 * skill.GetLevel(); + public override float GetMpcost(Skill skill) => (float)(135 + 12 * skill.GetLevel()); + public override int GetExecutetime(Skill skill) => 2000; + public override int GetCoolingtime(Skill skill) => 31000 - 1000 * skill.GetLevel(); public float GetRadius(Skill skill) => 0f; public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => (float)(19.5 + 0.9 * skill.GetLevel()); - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => (float)(19.5 + 0.9 * skill.GetLevel()); + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) diff --git a/Assets/PerfectWorld/Scripts/Skills/skill1864.cs b/Assets/PerfectWorld/Scripts/Skills/skill1864.cs index f8e28289ee..b96541edb8 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill1864.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill1864.cs @@ -63,13 +63,13 @@ namespace BrewMonster ~Skill1864Stub() { } - public float GetMpcost(Skill skill) => 0f; - public int GetExecutetime(Skill skill) => 0; - public int GetCoolingtime(Skill skill) => 0; + public override float GetMpcost(Skill skill) => 0f; + public override int GetExecutetime(Skill skill) => 0; + public override int GetCoolingtime(Skill skill) => 0; public float GetRadius(Skill skill) => 0f; public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => 0f; + public override float GetPraydistance(Skill skill) => 0f; #if SKILL_SERVER public int GetEnmity(Skill skill) => 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill1865.cs b/Assets/PerfectWorld/Scripts/Skills/skill1865.cs index 2d2eb9a144..3a0f8d4fb5 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill1865.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill1865.cs @@ -126,17 +126,17 @@ namespace BrewMonster ~Skill1865Stub() { } - public float GetMpcost(Skill skill) => 545f; - public int GetExecutetime(Skill skill) => 600; - public int GetCoolingtime(Skill skill) => 45000; + public override float GetMpcost(Skill skill) => 545f; + public override int GetExecutetime(Skill skill) => 600; + public override int GetCoolingtime(Skill skill) => 45000; public float GetRadius(Skill skill) => 0f; public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => 30f; - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => 30f; + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_SERVER public int GetEnmity(Skill skill) => 100; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill1868.cs b/Assets/PerfectWorld/Scripts/Skills/skill1868.cs index ddd8c6d726..622592ba12 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill1868.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill1868.cs @@ -63,13 +63,13 @@ namespace BrewMonster ~Skill1868Stub() { } - public float GetMpcost(Skill skill) => 0f; - public int GetExecutetime(Skill skill) => 0; - public int GetCoolingtime(Skill skill) => 0; + public override float GetMpcost(Skill skill) => 0f; + public override int GetExecutetime(Skill skill) => 0; + public override int GetCoolingtime(Skill skill) => 0; public float GetRadius(Skill skill) => 0f; public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => 0f; + public override float GetPraydistance(Skill skill) => 0f; #if SKILL_SERVER public int GetEnmity(Skill skill) => 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill187.cs b/Assets/PerfectWorld/Scripts/Skills/skill187.cs index 40599a96b6..15b4b42267 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill187.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill187.cs @@ -57,7 +57,6 @@ namespace BrewMonster dobless = 0; commoncooldown = 0; commoncooldowntime = 0; - effect = "3233"; range = new Range(); range.type = 0; pre_skills = new Dictionary(); @@ -67,15 +66,15 @@ namespace BrewMonster ~Skill187Stub() { } - public float GetMpcost(Skill skill) => 1033f; - public int GetExecutetime(Skill skill) => 1000333; - public int GetCoolingtime(Skill skill) => 30002; + public override float GetMpcost(Skill skill) => 1033f; + public override int GetExecutetime(Skill skill) => 1000333; + public override int GetCoolingtime(Skill skill) => 30002; public float GetRadius(Skill skill) => 0f; public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => 1533f; - public int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => 1533f; + public override int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_SERVER public int GetEnmity(Skill skill) => 33344; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill1871.cs b/Assets/PerfectWorld/Scripts/Skills/skill1871.cs index 3396c92d2c..9fe3c2fa1b 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill1871.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill1871.cs @@ -128,17 +128,17 @@ namespace BrewMonster ~Skill1871Stub() { } - public float GetMpcost(Skill skill) => 392f; - public int GetExecutetime(Skill skill) => 1700; - public int GetCoolingtime(Skill skill) => 300000; + public override float GetMpcost(Skill skill) => 392f; + public override int GetExecutetime(Skill skill) => 1700; + public override int GetCoolingtime(Skill skill) => 300000; public float GetRadius(Skill skill) => 10f; public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => (float)(skill.GetPlayer().GetRange()); - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => (float)(skill.GetPlayer().GetRange()); + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_SERVER public int GetEnmity(Skill skill) => 100; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill1872.cs b/Assets/PerfectWorld/Scripts/Skills/skill1872.cs index 2a68452ac1..2fb237bb32 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill1872.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill1872.cs @@ -63,13 +63,13 @@ namespace BrewMonster ~Skill1872Stub() { } - public float GetMpcost(Skill skill) => 0f; - public int GetExecutetime(Skill skill) => 0; - public int GetCoolingtime(Skill skill) => 0; + public override float GetMpcost(Skill skill) => 0f; + public override int GetExecutetime(Skill skill) => 0; + public override int GetCoolingtime(Skill skill) => 0; public float GetRadius(Skill skill) => 0f; public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => 0f; + public override float GetPraydistance(Skill skill) => 0f; #if SKILL_SERVER public int GetEnmity(Skill skill) => 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill1873.cs b/Assets/PerfectWorld/Scripts/Skills/skill1873.cs index e295e598d2..f2cc022ba4 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill1873.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill1873.cs @@ -125,17 +125,17 @@ namespace BrewMonster ~Skill1873Stub() { } - public float GetMpcost(Skill skill) => 432f; - public int GetExecutetime(Skill skill) => 600; - public int GetCoolingtime(Skill skill) => 60000; + public override float GetMpcost(Skill skill) => 432f; + public override int GetExecutetime(Skill skill) => 600; + public override int GetCoolingtime(Skill skill) => 60000; public float GetRadius(Skill skill) => 0f; public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => 30f; - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => 30f; + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_SERVER public int GetEnmity(Skill skill) => 100; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill1874.cs b/Assets/PerfectWorld/Scripts/Skills/skill1874.cs index 496da3b258..7c964cdf58 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill1874.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill1874.cs @@ -125,17 +125,17 @@ namespace BrewMonster ~Skill1874Stub() { } - public float GetMpcost(Skill skill) => 432f; - public int GetExecutetime(Skill skill) => 600; - public int GetCoolingtime(Skill skill) => 60000; + public override float GetMpcost(Skill skill) => 432f; + public override int GetExecutetime(Skill skill) => 600; + public override int GetCoolingtime(Skill skill) => 60000; public float GetRadius(Skill skill) => 0f; public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => 30f; - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => 30f; + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_SERVER public int GetEnmity(Skill skill) => 100; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill1951.cs b/Assets/PerfectWorld/Scripts/Skills/skill1951.cs index 131d8c6c58..015337e03f 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill1951.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill1951.cs @@ -119,15 +119,15 @@ namespace BrewMonster ~Skill1951Stub() { } - public float GetMpcost(Skill skill) => 0f; - public int GetExecutetime(Skill skill) => 1000; - public int GetCoolingtime(Skill skill) => 0; + public override float GetMpcost(Skill skill) => 0f; + public override int GetExecutetime(Skill skill) => 1000; + public override int GetCoolingtime(Skill skill) => 0; public float GetRadius(Skill skill) => 0f; public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => 30f; - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => 30f; + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; #if SKILL_SERVER public int GetEnmity(Skill skill) => 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill2.cs b/Assets/PerfectWorld/Scripts/Skills/skill2.cs index 9105e9d7b1..3fa0993399 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill2.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill2.cs @@ -107,10 +107,21 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; + effect = "寸力.sgc"; + doenchant = 1; + dobless = 0; + commoncooldown = 0; + commoncooldowntime = 0; restrict_weapons.Add(0); - effect = ""; + restrict_weapons.Add(1); + restrict_weapons.Add(182); + restrict_weapons.Add(9); + restrict_weapons.Add(5); + restrict_weapons.Add(292); range = new Range(); range.type = 0; + pre_skills = new Dictionary(); + pre_skills.Add(1, 1); #if SKILL_SERVER statestub.Add(new State1()); statestub.Add(new State2()); @@ -120,21 +131,24 @@ namespace BrewMonster ~Skill2Stub() { } - public float GetMpcost(Skill skill) => (float)(-2.2 + 5.6 * skill.GetLevel()); - public int GetExecutetime(Skill skill) => 700; - public int GetCoolingtime(Skill skill) => 8000; + public override float GetMpcost(Skill skill) => (float)(-2.2 + 5.6 * skill.GetLevel()); + public override int GetExecutetime(Skill skill) => 700; + public override int GetCoolingtime(Skill skill) => 8000; public float GetRadius(Skill skill) => 0f; public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => (float)(skill.GetPlayer().GetRange()); - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => (float)(skill.GetPlayer().GetRange()); + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) { - string result = string.Format(format, skill.GetLevel(), -2.2 + 5.6 * skill.GetLevel(), 5.9 * skill.GetLevel() * skill.GetLevel() + 126.7 * skill.GetLevel() + 40.5); + string result = string.Format(format, + skill.GetLevel(), + -2.2 + 5.6 * skill.GetLevel(), + 5.9 * skill.GetLevel() * skill.GetLevel() + 126.7 * skill.GetLevel() + 40.5); if (result.Length < length) { buffer.Append(result); @@ -146,10 +160,7 @@ namespace BrewMonster #if SKILL_SERVER public int GetEnmity(Skill skill) => 0; - public bool StateAttack(Skill skill) - { - return true; - } + public bool StateAttack(Skill skill) => true; public bool TakeEffect(Skill skill) => true; public float GetEffectdistance(Skill skill) => 11.7f; public int GetAttackspeed(Skill skill) => 3; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill2206.cs b/Assets/PerfectWorld/Scripts/Skills/skill2206.cs index ad37401d61..594ed4e4dd 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill2206.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill2206.cs @@ -134,17 +134,17 @@ namespace BrewMonster ~Skill2206Stub() { } - public float GetMpcost(Skill skill) => 125f; - public int GetExecutetime(Skill skill) => 1000; - public int GetCoolingtime(Skill skill) => 3000; + public override float GetMpcost(Skill skill) => 125f; + public override int GetExecutetime(Skill skill) => 1000; + public override int GetCoolingtime(Skill skill) => 3000; public float GetRadius(Skill skill) => 0f; public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => (float)(skill.GetPlayer().GetRange()); - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => (float)(skill.GetPlayer().GetRange()); + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) diff --git a/Assets/PerfectWorld/Scripts/Skills/skill2207.cs b/Assets/PerfectWorld/Scripts/Skills/skill2207.cs index 9273b49382..b02f5db98c 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill2207.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill2207.cs @@ -134,17 +134,17 @@ namespace BrewMonster ~Skill2207Stub() { } - public float GetMpcost(Skill skill) => 125f; - public int GetExecutetime(Skill skill) => 1000; - public int GetCoolingtime(Skill skill) => 3000; + public override float GetMpcost(Skill skill) => 125f; + public override int GetExecutetime(Skill skill) => 1000; + public override int GetCoolingtime(Skill skill) => 3000; public float GetRadius(Skill skill) => 0f; public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => (float)(skill.GetPlayer().GetRange()); - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => (float)(skill.GetPlayer().GetRange()); + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) diff --git a/Assets/PerfectWorld/Scripts/Skills/skill2208.cs b/Assets/PerfectWorld/Scripts/Skills/skill2208.cs index fb731f2597..98d85f0cbb 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill2208.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill2208.cs @@ -134,17 +134,17 @@ namespace BrewMonster ~Skill2208Stub() { } - public float GetMpcost(Skill skill) => 210f; - public int GetExecutetime(Skill skill) => 1000; - public int GetCoolingtime(Skill skill) => 3000; + public override float GetMpcost(Skill skill) => 210f; + public override int GetExecutetime(Skill skill) => 1000; + public override int GetCoolingtime(Skill skill) => 3000; public float GetRadius(Skill skill) => 10f; public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => (float)(skill.GetPlayer().GetRange()); - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => (float)(skill.GetPlayer().GetRange()); + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) diff --git a/Assets/PerfectWorld/Scripts/Skills/skill2209.cs b/Assets/PerfectWorld/Scripts/Skills/skill2209.cs index a544a932bf..e9937f0690 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill2209.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill2209.cs @@ -134,17 +134,17 @@ namespace BrewMonster ~Skill2209Stub() { } - public float GetMpcost(Skill skill) => 210f; - public int GetExecutetime(Skill skill) => 1000; - public int GetCoolingtime(Skill skill) => 3000; + public override float GetMpcost(Skill skill) => 210f; + public override int GetExecutetime(Skill skill) => 1000; + public override int GetCoolingtime(Skill skill) => 3000; public float GetRadius(Skill skill) => 12f; public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => (float)(skill.GetPlayer().GetRange()); - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => (float)(skill.GetPlayer().GetRange()); + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) diff --git a/Assets/PerfectWorld/Scripts/Skills/skill2210.cs b/Assets/PerfectWorld/Scripts/Skills/skill2210.cs index b9ffa6dac0..c2cbe6713d 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill2210.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill2210.cs @@ -134,17 +134,17 @@ namespace BrewMonster ~Skill2210Stub() { } - public float GetMpcost(Skill skill) => 150f; - public int GetExecutetime(Skill skill) => 1800; - public int GetCoolingtime(Skill skill) => 6000; + public override float GetMpcost(Skill skill) => 150f; + public override int GetExecutetime(Skill skill) => 1800; + public override int GetCoolingtime(Skill skill) => 6000; public float GetRadius(Skill skill) => 0f; public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => (float)(skill.GetPlayer().GetRange()); - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => (float)(skill.GetPlayer().GetRange()); + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) diff --git a/Assets/PerfectWorld/Scripts/Skills/skill2211.cs b/Assets/PerfectWorld/Scripts/Skills/skill2211.cs index b060532d54..d5b73e1567 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill2211.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill2211.cs @@ -134,17 +134,17 @@ namespace BrewMonster ~Skill2211Stub() { } - public float GetMpcost(Skill skill) => 150f; - public int GetExecutetime(Skill skill) => 1800; - public int GetCoolingtime(Skill skill) => 5000; + public override float GetMpcost(Skill skill) => 150f; + public override int GetExecutetime(Skill skill) => 1800; + public override int GetCoolingtime(Skill skill) => 5000; public float GetRadius(Skill skill) => 0f; public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => (float)(skill.GetPlayer().GetRange()); - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => (float)(skill.GetPlayer().GetRange()); + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) diff --git a/Assets/PerfectWorld/Scripts/Skills/skill2254.cs b/Assets/PerfectWorld/Scripts/Skills/skill2254.cs index 2fd6527514..3324845cf5 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill2254.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill2254.cs @@ -126,17 +126,17 @@ namespace BrewMonster ~Skill2254Stub() { } - public float GetMpcost(Skill skill) => 265f; - public int GetExecutetime(Skill skill) => 300; - public int GetCoolingtime(Skill skill) => 3000; + public override float GetMpcost(Skill skill) => 265f; + public override int GetExecutetime(Skill skill) => 300; + public override int GetCoolingtime(Skill skill) => 3000; public float GetRadius(Skill skill) => 0f; public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => 0f; - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => 0f; + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) diff --git a/Assets/PerfectWorld/Scripts/Skills/skill2255.cs b/Assets/PerfectWorld/Scripts/Skills/skill2255.cs index a4698aeae9..47e883d4a5 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill2255.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill2255.cs @@ -126,17 +126,17 @@ namespace BrewMonster ~Skill2255Stub() { } - public float GetMpcost(Skill skill) => 265f; - public int GetExecutetime(Skill skill) => 300; - public int GetCoolingtime(Skill skill) => 3000; + public override float GetMpcost(Skill skill) => 265f; + public override int GetExecutetime(Skill skill) => 300; + public override int GetCoolingtime(Skill skill) => 3000; public float GetRadius(Skill skill) => 0f; public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => 0f; - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => 0f; + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) diff --git a/Assets/PerfectWorld/Scripts/Skills/skill2256.cs b/Assets/PerfectWorld/Scripts/Skills/skill2256.cs index 9b697445a1..88ab29002e 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill2256.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill2256.cs @@ -126,17 +126,17 @@ namespace BrewMonster ~Skill2256Stub() { } - public float GetMpcost(Skill skill) => 265f; - public int GetExecutetime(Skill skill) => 300; - public int GetCoolingtime(Skill skill) => 3000; + public override float GetMpcost(Skill skill) => 265f; + public override int GetExecutetime(Skill skill) => 300; + public override int GetCoolingtime(Skill skill) => 3000; public float GetRadius(Skill skill) => 0f; public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => 0f; - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => 0f; + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) diff --git a/Assets/PerfectWorld/Scripts/Skills/skill2257.cs b/Assets/PerfectWorld/Scripts/Skills/skill2257.cs index e7bd53849e..2e39a0aa93 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill2257.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill2257.cs @@ -126,17 +126,17 @@ namespace BrewMonster ~Skill2257Stub() { } - public float GetMpcost(Skill skill) => 265f; - public int GetExecutetime(Skill skill) => 300; - public int GetCoolingtime(Skill skill) => 3000; + public override float GetMpcost(Skill skill) => 265f; + public override int GetExecutetime(Skill skill) => 300; + public override int GetCoolingtime(Skill skill) => 3000; public float GetRadius(Skill skill) => 0f; public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => 0f; - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => 0f; + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) diff --git a/Assets/PerfectWorld/Scripts/Skills/skill2258.cs b/Assets/PerfectWorld/Scripts/Skills/skill2258.cs index e1d6379480..91f711db60 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill2258.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill2258.cs @@ -126,17 +126,17 @@ namespace BrewMonster ~Skill2258Stub() { } - public float GetMpcost(Skill skill) => 265f; - public int GetExecutetime(Skill skill) => 300; - public int GetCoolingtime(Skill skill) => 3000; + public override float GetMpcost(Skill skill) => 265f; + public override int GetExecutetime(Skill skill) => 300; + public override int GetCoolingtime(Skill skill) => 3000; public float GetRadius(Skill skill) => 0f; public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => 0f; - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => 0f; + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) diff --git a/Assets/PerfectWorld/Scripts/Skills/skill2259.cs b/Assets/PerfectWorld/Scripts/Skills/skill2259.cs index f17ebfec71..473a3642d3 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill2259.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill2259.cs @@ -126,17 +126,17 @@ namespace BrewMonster ~Skill2259Stub() { } - public float GetMpcost(Skill skill) => 265f; - public int GetExecutetime(Skill skill) => 300; - public int GetCoolingtime(Skill skill) => 3000; + public override float GetMpcost(Skill skill) => 265f; + public override int GetExecutetime(Skill skill) => 300; + public override int GetCoolingtime(Skill skill) => 3000; public float GetRadius(Skill skill) => 0f; public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => 0f; - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => 0f; + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) diff --git a/Assets/PerfectWorld/Scripts/Skills/skill226.cs b/Assets/PerfectWorld/Scripts/Skills/skill226.cs index 82b121621b..da79367a05 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill226.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill226.cs @@ -101,10 +101,23 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - restrict_weapons.Add(0); effect = ""; + doenchant = 1; + dobless = 0; + commoncooldown = 0; + commoncooldowntime = 0; + restrict_weapons.Add(0); + restrict_weapons.Add(1); + restrict_weapons.Add(182); + restrict_weapons.Add(5); + restrict_weapons.Add(292); + restrict_weapons.Add(9); + restrict_weapons.Add(13); + restrict_weapons.Add(291); range = new Range(); - range.type = 0; + range.type = 5; + pre_skills = new Dictionary(); + pre_skills.Add(0, 1); #if SKILL_SERVER statestub.Add(new State1()); statestub.Add(new State2()); @@ -114,23 +127,20 @@ namespace BrewMonster ~Skill226Stub() { } - public float GetMpcost(Skill skill) => 0f; - public int GetExecutetime(Skill skill) => 1000; - public int GetCoolingtime(Skill skill) => 5000; + public override float GetMpcost(Skill skill) => 0f; + public override int GetExecutetime(Skill skill) => 1000; + public override int GetCoolingtime(Skill skill) => 5000; public float GetRadius(Skill skill) => 0f; public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => 0f; - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => 0f; + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_SERVER public int GetEnmity(Skill skill) => 0; - public bool StateAttack(Skill skill) - { - return true; - } + public bool StateAttack(Skill skill) => true; public bool TakeEffect(Skill skill) => true; public float GetEffectdistance(Skill skill) => 8.5f; public float GetHitrate(Skill skill) => 1.0f; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill2260.cs b/Assets/PerfectWorld/Scripts/Skills/skill2260.cs index fa3da241ad..84f91754a8 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill2260.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill2260.cs @@ -129,17 +129,17 @@ namespace BrewMonster ~Skill2260Stub() { } - public float GetMpcost(Skill skill) => 265f; - public int GetExecutetime(Skill skill) => 800; - public int GetCoolingtime(Skill skill) => 3000; + public override float GetMpcost(Skill skill) => 265f; + public override int GetExecutetime(Skill skill) => 800; + public override int GetCoolingtime(Skill skill) => 3000; public float GetRadius(Skill skill) => 0f; public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => 30f; - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => 30f; + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) diff --git a/Assets/PerfectWorld/Scripts/Skills/skill2261.cs b/Assets/PerfectWorld/Scripts/Skills/skill2261.cs index 73db1f28c4..e3ae1197b0 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill2261.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill2261.cs @@ -129,17 +129,17 @@ namespace BrewMonster ~Skill2261Stub() { } - public float GetMpcost(Skill skill) => 265f; - public int GetExecutetime(Skill skill) => 800; - public int GetCoolingtime(Skill skill) => 3000; + public override float GetMpcost(Skill skill) => 265f; + public override int GetExecutetime(Skill skill) => 800; + public override int GetCoolingtime(Skill skill) => 3000; public float GetRadius(Skill skill) => 0f; public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => 30f; - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => 30f; + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) diff --git a/Assets/PerfectWorld/Scripts/Skills/skill2262.cs b/Assets/PerfectWorld/Scripts/Skills/skill2262.cs index 7def91282e..4af503383b 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill2262.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill2262.cs @@ -126,17 +126,17 @@ namespace BrewMonster ~Skill2262Stub() { } - public float GetMpcost(Skill skill) => 600f; - public int GetExecutetime(Skill skill) => 1000; - public int GetCoolingtime(Skill skill) => 3000; + public override float GetMpcost(Skill skill) => 600f; + public override int GetExecutetime(Skill skill) => 1000; + public override int GetCoolingtime(Skill skill) => 3000; public float GetRadius(Skill skill) => 15f; public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => 5f; - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => 5f; + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) diff --git a/Assets/PerfectWorld/Scripts/Skills/skill2263.cs b/Assets/PerfectWorld/Scripts/Skills/skill2263.cs index d608f2600d..412c5546d5 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill2263.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill2263.cs @@ -126,17 +126,17 @@ namespace BrewMonster ~Skill2263Stub() { } - public float GetMpcost(Skill skill) => 600f; - public int GetExecutetime(Skill skill) => 1000; - public int GetCoolingtime(Skill skill) => 3000; + public override float GetMpcost(Skill skill) => 600f; + public override int GetExecutetime(Skill skill) => 1000; + public override int GetCoolingtime(Skill skill) => 3000; public float GetRadius(Skill skill) => 15f; public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => 5f; - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => 5f; + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) diff --git a/Assets/PerfectWorld/Scripts/Skills/skill2264.cs b/Assets/PerfectWorld/Scripts/Skills/skill2264.cs index e988768861..3830037fbc 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill2264.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill2264.cs @@ -130,17 +130,17 @@ namespace BrewMonster ~Skill2264Stub() { } - public float GetMpcost(Skill skill) => 320f; - public int GetExecutetime(Skill skill) => 1000; - public int GetCoolingtime(Skill skill) => 10000; + public override float GetMpcost(Skill skill) => 320f; + public override int GetExecutetime(Skill skill) => 1000; + public override int GetCoolingtime(Skill skill) => 10000; public float GetRadius(Skill skill) => 0f; public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => 30f; - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => 30f; + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) diff --git a/Assets/PerfectWorld/Scripts/Skills/skill2265.cs b/Assets/PerfectWorld/Scripts/Skills/skill2265.cs index ebc50dd266..3e05a45334 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill2265.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill2265.cs @@ -130,17 +130,17 @@ namespace BrewMonster ~Skill2265Stub() { } - public float GetMpcost(Skill skill) => 320f; - public int GetExecutetime(Skill skill) => 1000; - public int GetCoolingtime(Skill skill) => 10000; + public override float GetMpcost(Skill skill) => 320f; + public override int GetExecutetime(Skill skill) => 1000; + public override int GetCoolingtime(Skill skill) => 10000; public float GetRadius(Skill skill) => 0f; public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => 30f; - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => 30f; + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) diff --git a/Assets/PerfectWorld/Scripts/Skills/skill227.cs b/Assets/PerfectWorld/Scripts/Skills/skill227.cs index 99ad3975cc..91211919ff 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill227.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill227.cs @@ -101,10 +101,23 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - restrict_weapons.Add(0); effect = ""; + doenchant = 1; + dobless = 0; + commoncooldown = 0; + commoncooldowntime = 0; + restrict_weapons.Add(0); + restrict_weapons.Add(1); + restrict_weapons.Add(182); + restrict_weapons.Add(5); + restrict_weapons.Add(292); + restrict_weapons.Add(9); + restrict_weapons.Add(291); + restrict_weapons.Add(13); range = new Range(); - range.type = 0; + range.type = 5; + pre_skills = new Dictionary(); + pre_skills.Add(0, 1); #if SKILL_SERVER statestub.Add(new State1()); statestub.Add(new State2()); @@ -114,23 +127,20 @@ namespace BrewMonster ~Skill227Stub() { } - public float GetMpcost(Skill skill) => 0f; - public int GetExecutetime(Skill skill) => 2000; - public int GetCoolingtime(Skill skill) => 5000; + public override float GetMpcost(Skill skill) => 0f; + public override int GetExecutetime(Skill skill) => 2000; + public override int GetCoolingtime(Skill skill) => 5000; public float GetRadius(Skill skill) => 0f; public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => 0f; - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => 0f; + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_SERVER public int GetEnmity(Skill skill) => 0; - public bool StateAttack(Skill skill) - { - return true; - } + public bool StateAttack(Skill skill) => true; public bool TakeEffect(Skill skill) => true; public float GetEffectdistance(Skill skill) => 8.5f; public float GetHitrate(Skill skill) => 1.0f; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill228.cs b/Assets/PerfectWorld/Scripts/Skills/skill228.cs index 2023fafe31..92236debc2 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill228.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill228.cs @@ -127,16 +127,16 @@ namespace BrewMonster ~Skill228Stub() { } - public float GetMpcost(Skill skill) => 0f; - public int GetExecutetime(Skill skill) => 1000; - public int GetCoolingtime(Skill skill) => 5000; + public override float GetMpcost(Skill skill) => 0f; + public override int GetExecutetime(Skill skill) => 1000; + public override int GetCoolingtime(Skill skill) => 5000; public float GetRadius(Skill skill) => 0f; public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => 0f; - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => 0f; + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_SERVER public int GetEnmity(Skill skill) => 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill229.cs b/Assets/PerfectWorld/Scripts/Skills/skill229.cs index 23fc0dfa85..70d611b60a 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill229.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill229.cs @@ -127,16 +127,16 @@ namespace BrewMonster ~Skill229Stub() { } - public float GetMpcost(Skill skill) => 0f; - public int GetExecutetime(Skill skill) => 2000; - public int GetCoolingtime(Skill skill) => 5000; + public override float GetMpcost(Skill skill) => 0f; + public override int GetExecutetime(Skill skill) => 2000; + public override int GetCoolingtime(Skill skill) => 5000; public float GetRadius(Skill skill) => 0f; public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => 0f; - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => 0f; + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_SERVER public int GetEnmity(Skill skill) => 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill2352.cs b/Assets/PerfectWorld/Scripts/Skills/skill2352.cs index 0834b30cfe..4ac6f493f3 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill2352.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill2352.cs @@ -128,17 +128,17 @@ namespace BrewMonster ~Skill2352Stub() { } - public float GetMpcost(Skill skill) => 165f; - public int GetExecutetime(Skill skill) => 1200; - public int GetCoolingtime(Skill skill) => 6000; + public override float GetMpcost(Skill skill) => 165f; + public override int GetExecutetime(Skill skill) => 1200; + public override int GetCoolingtime(Skill skill) => 6000; public float GetRadius(Skill skill) => 0f; public float GetAttackdistance(Skill skill) => (float)(skill.GetPlayer().GetRange() + 0.3 * skill.GetLevel()); public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => 20f; - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => 20f; + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_SERVER public int GetEnmity(Skill skill) => 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill2367.cs b/Assets/PerfectWorld/Scripts/Skills/skill2367.cs index 356706ac23..1dadc1fd61 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill2367.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill2367.cs @@ -128,17 +128,17 @@ namespace BrewMonster ~Skill2367Stub() { } - public float GetMpcost(Skill skill) => 165f; - public int GetExecutetime(Skill skill) => 1200; - public int GetCoolingtime(Skill skill) => 6000; + public override float GetMpcost(Skill skill) => 165f; + public override int GetExecutetime(Skill skill) => 1200; + public override int GetCoolingtime(Skill skill) => 6000; public float GetRadius(Skill skill) => 0f; public float GetAttackdistance(Skill skill) => (float)(skill.GetPlayer().GetRange() + 0.3 * skill.GetLevel()); public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => 20f; - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => 20f; + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_SERVER public int GetEnmity(Skill skill) => 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill2368.cs b/Assets/PerfectWorld/Scripts/Skills/skill2368.cs index 68a3127f29..fe419f1b8e 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill2368.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill2368.cs @@ -128,17 +128,17 @@ namespace BrewMonster ~Skill2368Stub() { } - public float GetMpcost(Skill skill) => 140f; - public int GetExecutetime(Skill skill) => 800; - public int GetCoolingtime(Skill skill) => 6000; + public override float GetMpcost(Skill skill) => 140f; + public override int GetExecutetime(Skill skill) => 800; + public override int GetCoolingtime(Skill skill) => 6000; public float GetRadius(Skill skill) => 0f; public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => 20f; - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => 20f; + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_SERVER public int GetEnmity(Skill skill) => 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill2369.cs b/Assets/PerfectWorld/Scripts/Skills/skill2369.cs index a2b6fb1f2f..c4790866cc 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill2369.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill2369.cs @@ -128,17 +128,17 @@ namespace BrewMonster ~Skill2369Stub() { } - public float GetMpcost(Skill skill) => 140f; - public int GetExecutetime(Skill skill) => 900; - public int GetCoolingtime(Skill skill) => 6000; + public override float GetMpcost(Skill skill) => 140f; + public override int GetExecutetime(Skill skill) => 900; + public override int GetCoolingtime(Skill skill) => 6000; public float GetRadius(Skill skill) => 0f; public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => 20f; - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => 20f; + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_SERVER public int GetEnmity(Skill skill) => 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill2370.cs b/Assets/PerfectWorld/Scripts/Skills/skill2370.cs index ea379cf739..de74f6e52f 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill2370.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill2370.cs @@ -130,17 +130,17 @@ namespace BrewMonster ~Skill2370Stub() { } - public float GetMpcost(Skill skill) => 165f; - public int GetExecutetime(Skill skill) => 800; - public int GetCoolingtime(Skill skill) => 6000; + public override float GetMpcost(Skill skill) => 165f; + public override int GetExecutetime(Skill skill) => 800; + public override int GetCoolingtime(Skill skill) => 6000; public float GetRadius(Skill skill) => 3.5f; public float GetAttackdistance(Skill skill) => 15f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => 8f; - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => 8f; + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_SERVER public int GetEnmity(Skill skill) => 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill2371.cs b/Assets/PerfectWorld/Scripts/Skills/skill2371.cs index 0656f6c8fb..a5e9807ff3 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill2371.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill2371.cs @@ -130,17 +130,17 @@ namespace BrewMonster ~Skill2371Stub() { } - public float GetMpcost(Skill skill) => 165f; - public int GetExecutetime(Skill skill) => 800; - public int GetCoolingtime(Skill skill) => 6000; + public override float GetMpcost(Skill skill) => 165f; + public override int GetExecutetime(Skill skill) => 800; + public override int GetCoolingtime(Skill skill) => 6000; public float GetRadius(Skill skill) => 3.5f; public float GetAttackdistance(Skill skill) => 15f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => 8f; - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => 8f; + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_SERVER public int GetEnmity(Skill skill) => 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill2372.cs b/Assets/PerfectWorld/Scripts/Skills/skill2372.cs index fcdcb90108..cffeff5edb 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill2372.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill2372.cs @@ -129,17 +129,17 @@ namespace BrewMonster ~Skill2372Stub() { } - public float GetMpcost(Skill skill) => 210f; - public int GetExecutetime(Skill skill) => 2000; - public int GetCoolingtime(Skill skill) => 5000; + public override float GetMpcost(Skill skill) => 210f; + public override int GetExecutetime(Skill skill) => 2000; + public override int GetCoolingtime(Skill skill) => 5000; public float GetRadius(Skill skill) => 10f; public float GetAttackdistance(Skill skill) => (float)(skill.GetPlayer().GetRange() + 3 + 0.3 * skill.GetLevel()); public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => (float)(skill.GetPlayer().GetRange()); - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => (float)(skill.GetPlayer().GetRange()); + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) diff --git a/Assets/PerfectWorld/Scripts/Skills/skill2373.cs b/Assets/PerfectWorld/Scripts/Skills/skill2373.cs index 807d616fd8..83270bda2a 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill2373.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill2373.cs @@ -129,17 +129,17 @@ namespace BrewMonster ~Skill2373Stub() { } - public float GetMpcost(Skill skill) => 210f; - public int GetExecutetime(Skill skill) => 2000; - public int GetCoolingtime(Skill skill) => 5000; + public override float GetMpcost(Skill skill) => 210f; + public override int GetExecutetime(Skill skill) => 2000; + public override int GetCoolingtime(Skill skill) => 5000; public float GetRadius(Skill skill) => 10f; public float GetAttackdistance(Skill skill) => (float)(skill.GetPlayer().GetRange() + 3 + 0.3 * skill.GetLevel()); public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => (float)(skill.GetPlayer().GetRange()); - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => (float)(skill.GetPlayer().GetRange()); + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) diff --git a/Assets/PerfectWorld/Scripts/Skills/skill2374.cs b/Assets/PerfectWorld/Scripts/Skills/skill2374.cs index a82039ae6c..9abff2d05b 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill2374.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill2374.cs @@ -133,17 +133,17 @@ namespace BrewMonster ~Skill2374Stub() { } - public float GetMpcost(Skill skill) => 140f; - public int GetExecutetime(Skill skill) => 1500; - public int GetCoolingtime(Skill skill) => 15000; + public override float GetMpcost(Skill skill) => 140f; + public override int GetExecutetime(Skill skill) => 1500; + public override int GetCoolingtime(Skill skill) => 15000; public float GetRadius(Skill skill) => 0f; public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => (float)(skill.GetPlayer().GetRange()); - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => (float)(skill.GetPlayer().GetRange()); + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_SERVER public int GetEnmity(Skill skill) => 3000; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill2375.cs b/Assets/PerfectWorld/Scripts/Skills/skill2375.cs index 65b89640ed..9b0bc50a81 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill2375.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill2375.cs @@ -133,17 +133,17 @@ namespace BrewMonster ~Skill2375Stub() { } - public float GetMpcost(Skill skill) => 140f; - public int GetExecutetime(Skill skill) => 1500; - public int GetCoolingtime(Skill skill) => 15000; + public override float GetMpcost(Skill skill) => 140f; + public override int GetExecutetime(Skill skill) => 1500; + public override int GetCoolingtime(Skill skill) => 15000; public float GetRadius(Skill skill) => 0f; public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => (float)(skill.GetPlayer().GetRange()); - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => (float)(skill.GetPlayer().GetRange()); + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_SERVER public int GetEnmity(Skill skill) => 3000; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill2452.cs b/Assets/PerfectWorld/Scripts/Skills/skill2452.cs index dc118e058d..0f52f2fa99 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill2452.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill2452.cs @@ -171,17 +171,17 @@ namespace BrewMonster ~Skill2452Stub() { } - public float GetMpcost(Skill skill) => 445f; - public int GetExecutetime(Skill skill) => -1; - public int GetCoolingtime(Skill skill) => 30000; + public override float GetMpcost(Skill skill) => 445f; + public override int GetExecutetime(Skill skill) => -1; + public override int GetCoolingtime(Skill skill) => 30000; public float GetRadius(Skill skill) => 0f; public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => 30f; - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => 30f; + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) diff --git a/Assets/PerfectWorld/Scripts/Skills/skill2453.cs b/Assets/PerfectWorld/Scripts/Skills/skill2453.cs index 719c9ce047..6d11b92622 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill2453.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill2453.cs @@ -171,17 +171,17 @@ namespace BrewMonster ~Skill2453Stub() { } - public float GetMpcost(Skill skill) => 445f; - public int GetExecutetime(Skill skill) => -1; - public int GetCoolingtime(Skill skill) => 30000; + public override float GetMpcost(Skill skill) => 445f; + public override int GetExecutetime(Skill skill) => -1; + public override int GetCoolingtime(Skill skill) => 30000; public float GetRadius(Skill skill) => 0f; public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => 30f; - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => 30f; + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) diff --git a/Assets/PerfectWorld/Scripts/Skills/skill3.cs b/Assets/PerfectWorld/Scripts/Skills/skill3.cs index 9d73f94190..38dae95b38 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill3.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill3.cs @@ -107,10 +107,21 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; + effect = "凌风.sgc"; + doenchant = 1; + dobless = 0; + commoncooldown = 0; + commoncooldowntime = 0; restrict_weapons.Add(1); - effect = ""; + restrict_weapons.Add(5); + restrict_weapons.Add(9); + restrict_weapons.Add(182); + restrict_weapons.Add(292); + restrict_weapons.Add(0); range = new Range(); range.type = 0; + pre_skills = new Dictionary(); + pre_skills.Add(54, 1); #if SKILL_SERVER statestub.Add(new State1()); statestub.Add(new State2()); @@ -120,16 +131,16 @@ namespace BrewMonster ~Skill3Stub() { } - public float GetMpcost(Skill skill) => (float)(23.5 + 8.4 * skill.GetLevel()); - public int GetExecutetime(Skill skill) => 1800; - public int GetCoolingtime(Skill skill) => 6000; + public override float GetMpcost(Skill skill) => (float)(23.5 + 8.4 * skill.GetLevel()); + public override int GetExecutetime(Skill skill) => 1800; + public override int GetCoolingtime(Skill skill) => 6000; public float GetRadius(Skill skill) => 0f; public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => (float)(skill.GetPlayer().GetRange()); - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => (float)(skill.GetPlayer().GetRange()); + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) @@ -151,10 +162,7 @@ namespace BrewMonster #if SKILL_SERVER public int GetEnmity(Skill skill) => 0; - public bool StateAttack(Skill skill) - { - return true; - } + public bool StateAttack(Skill skill) => true; public bool TakeEffect(Skill skill) => true; public float GetEffectdistance(Skill skill) => 22.1f; public int GetAttackspeed(Skill skill) => 15; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill362.cs b/Assets/PerfectWorld/Scripts/Skills/skill362.cs index a6884bdbb7..9fac60b92f 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill362.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill362.cs @@ -101,10 +101,23 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - restrict_weapons.Add(0); effect = ""; + doenchant = 1; + dobless = 0; + commoncooldown = 0; + commoncooldowntime = 0; + restrict_weapons.Add(0); + restrict_weapons.Add(1); + restrict_weapons.Add(182); + restrict_weapons.Add(5); + restrict_weapons.Add(292); + restrict_weapons.Add(9); + restrict_weapons.Add(291); + restrict_weapons.Add(13); range = new Range(); - range.type = 0; + range.type = 5; + pre_skills = new Dictionary(); + pre_skills.Add(0, 1); #if SKILL_SERVER statestub.Add(new State1()); statestub.Add(new State2()); @@ -114,23 +127,20 @@ namespace BrewMonster ~Skill362Stub() { } - public float GetMpcost(Skill skill) => 0f; - public int GetExecutetime(Skill skill) => 3000; - public int GetCoolingtime(Skill skill) => 5000; + public override float GetMpcost(Skill skill) => 0f; + public override int GetExecutetime(Skill skill) => 3000; + public override int GetCoolingtime(Skill skill) => 5000; public float GetRadius(Skill skill) => 0f; public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => 0f; - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => 0f; + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_SERVER public int GetEnmity(Skill skill) => 0; - public bool StateAttack(Skill skill) - { - return true; - } + public bool StateAttack(Skill skill) => true; public bool TakeEffect(Skill skill) => true; public float GetEffectdistance(Skill skill) => 8.5f; public float GetHitrate(Skill skill) => 1.0f; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill363.cs b/Assets/PerfectWorld/Scripts/Skills/skill363.cs index 7d2681e863..5c3c98016d 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill363.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill363.cs @@ -101,10 +101,23 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - restrict_weapons.Add(0); effect = ""; + doenchant = 1; + dobless = 0; + commoncooldown = 0; + commoncooldowntime = 0; + restrict_weapons.Add(0); + restrict_weapons.Add(1); + restrict_weapons.Add(182); + restrict_weapons.Add(5); + restrict_weapons.Add(292); + restrict_weapons.Add(9); + restrict_weapons.Add(291); + restrict_weapons.Add(13); range = new Range(); - range.type = 0; + range.type = 5; + pre_skills = new Dictionary(); + pre_skills.Add(0, 1); #if SKILL_SERVER statestub.Add(new State1()); statestub.Add(new State2()); @@ -114,23 +127,20 @@ namespace BrewMonster ~Skill363Stub() { } - public float GetMpcost(Skill skill) => 0f; - public int GetExecutetime(Skill skill) => 3000; - public int GetCoolingtime(Skill skill) => 5000; + public override float GetMpcost(Skill skill) => 0f; + public override int GetExecutetime(Skill skill) => 3000; + public override int GetCoolingtime(Skill skill) => 5000; public float GetRadius(Skill skill) => 0f; public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => 0f; - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => 0f; + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_SERVER public int GetEnmity(Skill skill) => 0; - public bool StateAttack(Skill skill) - { - return true; - } + public bool StateAttack(Skill skill) => true; public bool TakeEffect(Skill skill) => true; public float GetEffectdistance(Skill skill) => 8.5f; public float GetHitrate(Skill skill) => 1.0f; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill364.cs b/Assets/PerfectWorld/Scripts/Skills/skill364.cs index 126c618770..5e1d1d2c4a 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill364.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill364.cs @@ -127,16 +127,16 @@ namespace BrewMonster ~Skill364Stub() { } - public float GetMpcost(Skill skill) => 0f; - public int GetExecutetime(Skill skill) => 3000; - public int GetCoolingtime(Skill skill) => 5000; + public override float GetMpcost(Skill skill) => 0f; + public override int GetExecutetime(Skill skill) => 3000; + public override int GetCoolingtime(Skill skill) => 5000; public float GetRadius(Skill skill) => 0f; public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => 0f; - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => 0f; + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_SERVER public int GetEnmity(Skill skill) => 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill365.cs b/Assets/PerfectWorld/Scripts/Skills/skill365.cs index 937d7b5d9e..a726f8bd53 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill365.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill365.cs @@ -127,16 +127,16 @@ namespace BrewMonster ~Skill365Stub() { } - public float GetMpcost(Skill skill) => 0f; - public int GetExecutetime(Skill skill) => 3000; - public int GetCoolingtime(Skill skill) => 5000; + public override float GetMpcost(Skill skill) => 0f; + public override int GetExecutetime(Skill skill) => 3000; + public override int GetCoolingtime(Skill skill) => 5000; public float GetRadius(Skill skill) => 0f; public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => 0f; - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => 0f; + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_SERVER public int GetEnmity(Skill skill) => 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill374.cs b/Assets/PerfectWorld/Scripts/Skills/skill374.cs index ed7d309639..d9eb548dbb 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill374.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill374.cs @@ -85,8 +85,8 @@ namespace BrewMonster public Skill374Stub() : base(374) { cls = 0; - name = "真・虎击"; - nativename = "真・虎击"; + name = "真·虎击"; + nativename = "真·虎击"; icon = "虎击1.dds"; max_level = 1; type = 1; @@ -108,10 +108,21 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; + effect = "1虎击.sgc"; + doenchant = 0; + dobless = 1; + commoncooldown = 0; + commoncooldowntime = 0; restrict_weapons.Add(0); - effect = ""; + restrict_weapons.Add(1); + restrict_weapons.Add(182); + restrict_weapons.Add(5); + restrict_weapons.Add(292); + restrict_weapons.Add(9); range = new Range(); range.type = 0; + pre_skills = new Dictionary(); + pre_skills.Add(1, 10); #if SKILL_SERVER statestub.Add(new State1()); statestub.Add(new State2()); @@ -121,17 +132,17 @@ namespace BrewMonster ~Skill374Stub() { } - public float GetMpcost(Skill skill) => 125f; - public int GetExecutetime(Skill skill) => 700; - public int GetCoolingtime(Skill skill) => 3000; + public override float GetMpcost(Skill skill) => 125f; + public override int GetExecutetime(Skill skill) => 700; + public override int GetCoolingtime(Skill skill) => 3000; public float GetRadius(Skill skill) => 0f; public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => (float)(skill.GetPlayer().GetRange()); - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => (float)(skill.GetPlayer().GetRange()); + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) @@ -148,10 +159,7 @@ namespace BrewMonster #if SKILL_SERVER public int GetEnmity(Skill skill) => 0; - public bool BlessMe(Skill skill) - { - return true; - } + public bool BlessMe(Skill skill) => true; public bool TakeEffect(Skill skill) => true; public float GetEffectdistance(Skill skill) => 13.3f; public int GetAttackspeed(Skill skill) => 2; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill375.cs b/Assets/PerfectWorld/Scripts/Skills/skill375.cs index 913595162d..13ad42231e 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill375.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill375.cs @@ -85,8 +85,8 @@ namespace BrewMonster public Skill375Stub() : base(375) { cls = 0; - name = "狂・虎击"; - nativename = "狂・虎击"; + name = "狂·虎击"; + nativename = "狂·虎击"; icon = "虎击2.dds"; max_level = 1; type = 1; @@ -108,10 +108,21 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; + effect = "2虎击.sgc"; + doenchant = 0; + dobless = 0; + commoncooldown = 0; + commoncooldowntime = 0; restrict_weapons.Add(0); - effect = ""; + restrict_weapons.Add(1); + restrict_weapons.Add(182); + restrict_weapons.Add(5); + restrict_weapons.Add(292); + restrict_weapons.Add(9); range = new Range(); range.type = 0; + pre_skills = new Dictionary(); + pre_skills.Add(1, 10); #if SKILL_SERVER statestub.Add(new State1()); statestub.Add(new State2()); @@ -121,17 +132,17 @@ namespace BrewMonster ~Skill375Stub() { } - public float GetMpcost(Skill skill) => 125f; - public int GetExecutetime(Skill skill) => 600; - public int GetCoolingtime(Skill skill) => 3000; + public override float GetMpcost(Skill skill) => 125f; + public override int GetExecutetime(Skill skill) => 600; + public override int GetCoolingtime(Skill skill) => 3000; public float GetRadius(Skill skill) => 0f; public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => (float)(skill.GetPlayer().GetRange()); - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => (float)(skill.GetPlayer().GetRange()); + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) diff --git a/Assets/PerfectWorld/Scripts/Skills/skill376.cs b/Assets/PerfectWorld/Scripts/Skills/skill376.cs index b375d44f32..11d1b66490 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill376.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill376.cs @@ -85,8 +85,8 @@ namespace BrewMonster public Skill376Stub() : base(376) { cls = 0; - name = "真・寸力"; - nativename = "真・寸力"; + name = "真·寸力"; + nativename = "真·寸力"; icon = "寸力1.dds"; max_level = 1; type = 1; @@ -109,10 +109,21 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; + effect = "1寸力.sgc"; + doenchant = 1; + dobless = 0; + commoncooldown = 0; + commoncooldowntime = 0; restrict_weapons.Add(0); - effect = ""; + restrict_weapons.Add(1); + restrict_weapons.Add(182); + restrict_weapons.Add(9); + restrict_weapons.Add(5); + restrict_weapons.Add(292); range = new Range(); range.type = 0; + pre_skills = new Dictionary(); + pre_skills.Add(2, 10); #if SKILL_SERVER statestub.Add(new State1()); statestub.Add(new State2()); @@ -122,17 +133,17 @@ namespace BrewMonster ~Skill376Stub() { } - public float GetMpcost(Skill skill) => 100f; - public int GetExecutetime(Skill skill) => 700; - public int GetCoolingtime(Skill skill) => 8000; + public override float GetMpcost(Skill skill) => 100f; + public override int GetExecutetime(Skill skill) => 700; + public override int GetCoolingtime(Skill skill) => 8000; public float GetRadius(Skill skill) => 0f; public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => (float)(skill.GetPlayer().GetRange()); - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => (float)(skill.GetPlayer().GetRange()); + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) @@ -149,16 +160,13 @@ namespace BrewMonster #if SKILL_SERVER public int GetEnmity(Skill skill) => 0; - public bool StateAttack(Skill skill) - { - return true; - } + public bool StateAttack(Skill skill) => true; public bool TakeEffect(Skill skill) => true; public float GetEffectdistance(Skill skill) => 11.7f; public int GetAttackspeed(Skill skill) => 3; public float GetHitrate(Skill skill) => 1.8f; public float GetTalent0(Skill skill) => 6079f; - public float GetTalent1(PlayerWrapper player) => player.GetAttackdegree (; + public float GetTalent1(Skill skill) => player.GetAttackdegree (; #endif } } diff --git a/Assets/PerfectWorld/Scripts/Skills/skill377.cs b/Assets/PerfectWorld/Scripts/Skills/skill377.cs index cabee5a643..052209184e 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill377.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill377.cs @@ -85,8 +85,8 @@ namespace BrewMonster public Skill377Stub() : base(377) { cls = 0; - name = "狂・寸力"; - nativename = "狂・寸力"; + name = "狂·寸力"; + nativename = "狂·寸力"; icon = "寸力2.dds"; max_level = 1; type = 1; @@ -109,10 +109,21 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; + effect = "2寸力.sgc"; + doenchant = 1; + dobless = 0; + commoncooldown = 0; + commoncooldowntime = 0; restrict_weapons.Add(0); - effect = ""; + restrict_weapons.Add(1); + restrict_weapons.Add(182); + restrict_weapons.Add(9); + restrict_weapons.Add(5); + restrict_weapons.Add(292); range = new Range(); range.type = 0; + pre_skills = new Dictionary(); + pre_skills.Add(2, 10); #if SKILL_SERVER statestub.Add(new State1()); statestub.Add(new State2()); @@ -122,17 +133,17 @@ namespace BrewMonster ~Skill377Stub() { } - public float GetMpcost(Skill skill) => 100f; - public int GetExecutetime(Skill skill) => 700; - public int GetCoolingtime(Skill skill) => 8000; + public override float GetMpcost(Skill skill) => 100f; + public override int GetExecutetime(Skill skill) => 700; + public override int GetCoolingtime(Skill skill) => 8000; public float GetRadius(Skill skill) => 0f; public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => (float)(skill.GetPlayer().GetRange()); - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => (float)(skill.GetPlayer().GetRange()); + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) @@ -149,16 +160,13 @@ namespace BrewMonster #if SKILL_SERVER public int GetEnmity(Skill skill) => 0; - public bool StateAttack(Skill skill) - { - return true; - } + public bool StateAttack(Skill skill) => true; public bool TakeEffect(Skill skill) => true; public float GetEffectdistance(Skill skill) => 11.7f; public int GetAttackspeed(Skill skill) => 3; public float GetHitrate(Skill skill) => 1.8f; public float GetTalent0(Skill skill) => 4676f; - public float GetTalent1(PlayerWrapper player) => player.GetAttackdegree (; + public float GetTalent1(Skill skill) => player.GetAttackdegree (; #endif } } diff --git a/Assets/PerfectWorld/Scripts/Skills/skill378.cs b/Assets/PerfectWorld/Scripts/Skills/skill378.cs index 75fa01826a..0b4de6dddf 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill378.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill378.cs @@ -85,8 +85,8 @@ namespace BrewMonster public Skill378Stub() : base(378) { cls = 0; - name = "真・流水"; - nativename = "真・流水"; + name = "真·流水"; + nativename = "真·流水"; icon = "流水1.dds"; max_level = 1; type = 1; @@ -108,10 +108,21 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; + effect = "1流水.sgc"; + doenchant = 0; + dobless = 0; + commoncooldown = 0; + commoncooldowntime = 0; restrict_weapons.Add(0); - effect = ""; + restrict_weapons.Add(1); + restrict_weapons.Add(182); + restrict_weapons.Add(5); + restrict_weapons.Add(292); + restrict_weapons.Add(9); range = new Range(); range.type = 0; + pre_skills = new Dictionary(); + pre_skills.Add(54, 10); #if SKILL_SERVER statestub.Add(new State1()); statestub.Add(new State2()); @@ -121,17 +132,17 @@ namespace BrewMonster ~Skill378Stub() { } - public float GetMpcost(Skill skill) => 125f; - public int GetExecutetime(Skill skill) => 1000; - public int GetCoolingtime(Skill skill) => 3000; + public override float GetMpcost(Skill skill) => 125f; + public override int GetExecutetime(Skill skill) => 1000; + public override int GetCoolingtime(Skill skill) => 3000; public float GetRadius(Skill skill) => 0f; public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => (float)(skill.GetPlayer().GetRange()); - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => (float)(skill.GetPlayer().GetRange()); + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) diff --git a/Assets/PerfectWorld/Scripts/Skills/skill379.cs b/Assets/PerfectWorld/Scripts/Skills/skill379.cs index 826b390209..abb4a11b08 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill379.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill379.cs @@ -85,8 +85,8 @@ namespace BrewMonster public Skill379Stub() : base(379) { cls = 0; - name = "狂・流水"; - nativename = "狂・流水"; + name = "狂·流水"; + nativename = "狂·流水"; icon = "流水2.dds"; max_level = 1; type = 1; @@ -108,10 +108,21 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; + effect = "2流水.sgc"; + doenchant = 0; + dobless = 1; + commoncooldown = 0; + commoncooldowntime = 0; restrict_weapons.Add(0); - effect = ""; + restrict_weapons.Add(1); + restrict_weapons.Add(182); + restrict_weapons.Add(5); + restrict_weapons.Add(292); + restrict_weapons.Add(9); range = new Range(); range.type = 0; + pre_skills = new Dictionary(); + pre_skills.Add(54, 10); #if SKILL_SERVER statestub.Add(new State1()); statestub.Add(new State2()); @@ -121,17 +132,17 @@ namespace BrewMonster ~Skill379Stub() { } - public float GetMpcost(Skill skill) => 125f; - public int GetExecutetime(Skill skill) => 1000; - public int GetCoolingtime(Skill skill) => 3000; + public override float GetMpcost(Skill skill) => 125f; + public override int GetExecutetime(Skill skill) => 1000; + public override int GetCoolingtime(Skill skill) => 3000; public float GetRadius(Skill skill) => 0f; public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => (float)(skill.GetPlayer().GetRange()); - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => (float)(skill.GetPlayer().GetRange()); + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) @@ -148,10 +159,7 @@ namespace BrewMonster #if SKILL_SERVER public int GetEnmity(Skill skill) => 4500; - public bool BlessMe(Skill skill) - { - return true; - } + public bool BlessMe(Skill skill) => true; public bool TakeEffect(Skill skill) => true; public float GetEffectdistance(Skill skill) => 14.1f; public int GetAttackspeed(Skill skill) => 12; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill380.cs b/Assets/PerfectWorld/Scripts/Skills/skill380.cs index 52eb551917..1205cf8499 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill380.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill380.cs @@ -85,8 +85,8 @@ namespace BrewMonster public Skill380Stub() : base(380) { cls = 0; - name = "真・凌风"; - nativename = "真・凌风"; + name = "真·凌风"; + nativename = "真·凌风"; icon = "凌风1.dds"; max_level = 1; type = 1; @@ -108,10 +108,21 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; + effect = "1凌风.sgc"; + doenchant = 1; + dobless = 0; + commoncooldown = 0; + commoncooldowntime = 0; restrict_weapons.Add(1); - effect = ""; + restrict_weapons.Add(5); + restrict_weapons.Add(9); + restrict_weapons.Add(182); + restrict_weapons.Add(292); + restrict_weapons.Add(0); range = new Range(); range.type = 0; + pre_skills = new Dictionary(); + pre_skills.Add(3, 10); #if SKILL_SERVER statestub.Add(new State1()); statestub.Add(new State2()); @@ -121,17 +132,17 @@ namespace BrewMonster ~Skill380Stub() { } - public float GetMpcost(Skill skill) => 150f; - public int GetExecutetime(Skill skill) => 1800; - public int GetCoolingtime(Skill skill) => 6000; + public override float GetMpcost(Skill skill) => 150f; + public override int GetExecutetime(Skill skill) => 1800; + public override int GetCoolingtime(Skill skill) => 6000; public float GetRadius(Skill skill) => 0f; public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => (float)(skill.GetPlayer().GetRange()); - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => (float)(skill.GetPlayer().GetRange()); + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) @@ -148,10 +159,7 @@ namespace BrewMonster #if SKILL_SERVER public int GetEnmity(Skill skill) => 0; - public bool StateAttack(Skill skill) - { - return true; - } + public bool StateAttack(Skill skill) => true; public bool TakeEffect(Skill skill) => true; public float GetEffectdistance(Skill skill) => 22.1f; public int GetAttackspeed(Skill skill) => 15; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill381.cs b/Assets/PerfectWorld/Scripts/Skills/skill381.cs index 9eacf576a9..0d39acc87d 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill381.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill381.cs @@ -85,8 +85,8 @@ namespace BrewMonster public Skill381Stub() : base(381) { cls = 0; - name = "狂・凌风"; - nativename = "狂・凌风"; + name = "狂·凌风"; + nativename = "狂·凌风"; icon = "凌风2.dds"; max_level = 1; type = 1; @@ -108,10 +108,21 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; + effect = "2凌风.sgc"; + doenchant = 1; + dobless = 0; + commoncooldown = 0; + commoncooldowntime = 0; restrict_weapons.Add(1); - effect = ""; + restrict_weapons.Add(5); + restrict_weapons.Add(9); + restrict_weapons.Add(182); + restrict_weapons.Add(292); + restrict_weapons.Add(0); range = new Range(); range.type = 0; + pre_skills = new Dictionary(); + pre_skills.Add(3, 10); #if SKILL_SERVER statestub.Add(new State1()); statestub.Add(new State2()); @@ -121,17 +132,17 @@ namespace BrewMonster ~Skill381Stub() { } - public float GetMpcost(Skill skill) => 150f; - public int GetExecutetime(Skill skill) => 1800; - public int GetCoolingtime(Skill skill) => 5000; + public override float GetMpcost(Skill skill) => 150f; + public override int GetExecutetime(Skill skill) => 1800; + public override int GetCoolingtime(Skill skill) => 5000; public float GetRadius(Skill skill) => 0f; public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => (float)(skill.GetPlayer().GetRange()); - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => (float)(skill.GetPlayer().GetRange()); + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) @@ -148,10 +159,7 @@ namespace BrewMonster #if SKILL_SERVER public int GetEnmity(Skill skill) => 0; - public bool StateAttack(Skill skill) - { - return true; - } + public bool StateAttack(Skill skill) => true; public bool TakeEffect(Skill skill) => true; public float GetEffectdistance(Skill skill) => 22.1f; public int GetAttackspeed(Skill skill) => 15; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill382.cs b/Assets/PerfectWorld/Scripts/Skills/skill382.cs index b137850d2e..fd9c4d81ca 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill382.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill382.cs @@ -85,8 +85,8 @@ namespace BrewMonster public Skill382Stub() : base(382) { cls = 0; - name = "真・龙现"; - nativename = "真・龙现"; + name = "真·龙现"; + nativename = "真·龙现"; icon = "龙现1.dds"; max_level = 1; type = 1; @@ -108,10 +108,21 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; + effect = "1龙现.sgc"; + doenchant = 0; + dobless = 0; + commoncooldown = 0; + commoncooldowntime = 0; restrict_weapons.Add(0); - effect = ""; + restrict_weapons.Add(1); + restrict_weapons.Add(182); + restrict_weapons.Add(5); + restrict_weapons.Add(292); + restrict_weapons.Add(9); range = new Range(); range.type = 0; + pre_skills = new Dictionary(); + pre_skills.Add(5, 10); #if SKILL_SERVER statestub.Add(new State1()); statestub.Add(new State2()); @@ -121,17 +132,17 @@ namespace BrewMonster ~Skill382Stub() { } - public float GetMpcost(Skill skill) => 150f; - public int GetExecutetime(Skill skill) => 500; - public int GetCoolingtime(Skill skill) => 5000; + public override float GetMpcost(Skill skill) => 150f; + public override int GetExecutetime(Skill skill) => 500; + public override int GetCoolingtime(Skill skill) => 5000; public float GetRadius(Skill skill) => 0f; public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => 10f; - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => 10f; + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) diff --git a/Assets/PerfectWorld/Scripts/Skills/skill383.cs b/Assets/PerfectWorld/Scripts/Skills/skill383.cs index 8ac40d5465..b803317cdb 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill383.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill383.cs @@ -85,8 +85,8 @@ namespace BrewMonster public Skill383Stub() : base(383) { cls = 0; - name = "狂・龙现"; - nativename = "狂・龙现"; + name = "狂·龙现"; + nativename = "狂·龙现"; icon = "龙现2.dds"; max_level = 1; type = 1; @@ -108,10 +108,21 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; + effect = "2龙现.sgc"; + doenchant = 0; + dobless = 0; + commoncooldown = 0; + commoncooldowntime = 0; restrict_weapons.Add(0); - effect = ""; + restrict_weapons.Add(1); + restrict_weapons.Add(182); + restrict_weapons.Add(5); + restrict_weapons.Add(292); + restrict_weapons.Add(9); range = new Range(); range.type = 0; + pre_skills = new Dictionary(); + pre_skills.Add(5, 10); #if SKILL_SERVER statestub.Add(new State1()); statestub.Add(new State2()); @@ -121,17 +132,17 @@ namespace BrewMonster ~Skill383Stub() { } - public float GetMpcost(Skill skill) => 150f; - public int GetExecutetime(Skill skill) => 500; - public int GetCoolingtime(Skill skill) => 6000; + public override float GetMpcost(Skill skill) => 150f; + public override int GetExecutetime(Skill skill) => 500; + public override int GetCoolingtime(Skill skill) => 6000; public float GetRadius(Skill skill) => 0f; public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => 12f; - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => 12f; + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) diff --git a/Assets/PerfectWorld/Scripts/Skills/skill384.cs b/Assets/PerfectWorld/Scripts/Skills/skill384.cs index 59fd7200b8..5af03f498e 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill384.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill384.cs @@ -85,8 +85,8 @@ namespace BrewMonster public Skill384Stub() : base(384) { cls = 0; - name = "真・断岩斩"; - nativename = "真・断岩斩"; + name = "真·断岩斩"; + nativename = "真·断岩斩"; icon = "断岩斩1.dds"; max_level = 1; type = 1; @@ -108,10 +108,21 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; + effect = "1断岩斩.sgc"; + doenchant = 1; + dobless = 0; + commoncooldown = 0; + commoncooldowntime = 0; restrict_weapons.Add(0); - effect = ""; + restrict_weapons.Add(1); + restrict_weapons.Add(182); + restrict_weapons.Add(5); + restrict_weapons.Add(292); + restrict_weapons.Add(9); range = new Range(); range.type = 0; + pre_skills = new Dictionary(); + pre_skills.Add(57, 10); #if SKILL_SERVER statestub.Add(new State1()); statestub.Add(new State2()); @@ -121,17 +132,17 @@ namespace BrewMonster ~Skill384Stub() { } - public float GetMpcost(Skill skill) => 140f; - public int GetExecutetime(Skill skill) => 1000; - public int GetCoolingtime(Skill skill) => 3000; + public override float GetMpcost(Skill skill) => 140f; + public override int GetExecutetime(Skill skill) => 1000; + public override int GetCoolingtime(Skill skill) => 3000; public float GetRadius(Skill skill) => 0f; public float GetAttackdistance(Skill skill) => (float)(skill.GetPlayer().GetRange() + 3 + 0.3 * skill.GetLevel()); public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => (float)(skill.GetPlayer().GetRange()); - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => (float)(skill.GetPlayer().GetRange()); + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) @@ -148,10 +159,7 @@ namespace BrewMonster #if SKILL_SERVER public int GetEnmity(Skill skill) => 0; - public bool StateAttack(Skill skill) - { - return true; - } + public bool StateAttack(Skill skill) => true; public bool TakeEffect(Skill skill) => true; public float GetEffectdistance(Skill skill) => 14.9f; public int GetAttackspeed(Skill skill) => 6; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill385.cs b/Assets/PerfectWorld/Scripts/Skills/skill385.cs index 17b5fbac10..4adfdb9bb0 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill385.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill385.cs @@ -85,8 +85,8 @@ namespace BrewMonster public Skill385Stub() : base(385) { cls = 0; - name = "狂・断岩斩"; - nativename = "狂・断岩斩"; + name = "狂·断岩斩"; + nativename = "狂·断岩斩"; icon = "断岩斩2.dds"; max_level = 1; type = 1; @@ -108,10 +108,21 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; + effect = "2断岩斩.sgc"; + doenchant = 1; + dobless = 0; + commoncooldown = 0; + commoncooldowntime = 0; restrict_weapons.Add(0); - effect = ""; + restrict_weapons.Add(1); + restrict_weapons.Add(182); + restrict_weapons.Add(5); + restrict_weapons.Add(292); + restrict_weapons.Add(9); range = new Range(); range.type = 0; + pre_skills = new Dictionary(); + pre_skills.Add(57, 10); #if SKILL_SERVER statestub.Add(new State1()); statestub.Add(new State2()); @@ -121,17 +132,17 @@ namespace BrewMonster ~Skill385Stub() { } - public float GetMpcost(Skill skill) => 140f; - public int GetExecutetime(Skill skill) => 1000; - public int GetCoolingtime(Skill skill) => 3000; + public override float GetMpcost(Skill skill) => 140f; + public override int GetExecutetime(Skill skill) => 1000; + public override int GetCoolingtime(Skill skill) => 3000; public float GetRadius(Skill skill) => 0f; public float GetAttackdistance(Skill skill) => (float)(skill.GetPlayer().GetRange() + 3 + 0.3 * skill.GetLevel()); public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => (float)(skill.GetPlayer().GetRange()); - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => (float)(skill.GetPlayer().GetRange()); + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) @@ -148,10 +159,7 @@ namespace BrewMonster #if SKILL_SERVER public int GetEnmity(Skill skill) => 0; - public bool StateAttack(Skill skill) - { - return true; - } + public bool StateAttack(Skill skill) => true; public bool TakeEffect(Skill skill) => true; public float GetEffectdistance(Skill skill) => 14.9f; public int GetAttackspeed(Skill skill) => 6; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill386.cs b/Assets/PerfectWorld/Scripts/Skills/skill386.cs index 5329eefc4b..b38e77e201 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill386.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill386.cs @@ -85,8 +85,8 @@ namespace BrewMonster public Skill386Stub() : base(386) { cls = 0; - name = "真・狂龙斩"; - nativename = "真・狂龙斩"; + name = "真·狂龙斩"; + nativename = "真·狂龙斩"; icon = "狂龙斩1.dds"; max_level = 1; type = 1; @@ -108,10 +108,21 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; + effect = "1狂龙斩.sgc"; + doenchant = 0; + dobless = 0; + commoncooldown = 0; + commoncooldowntime = 0; restrict_weapons.Add(0); - effect = ""; + restrict_weapons.Add(1); + restrict_weapons.Add(182); + restrict_weapons.Add(5); + restrict_weapons.Add(292); + restrict_weapons.Add(9); range = new Range(); - range.type = 0; + range.type = 4; + pre_skills = new Dictionary(); + pre_skills.Add(55, 10); #if SKILL_SERVER statestub.Add(new State1()); statestub.Add(new State2()); @@ -121,17 +132,17 @@ namespace BrewMonster ~Skill386Stub() { } - public float GetMpcost(Skill skill) => 210f; - public int GetExecutetime(Skill skill) => 700; - public int GetCoolingtime(Skill skill) => 6000; + public override float GetMpcost(Skill skill) => 210f; + public override int GetExecutetime(Skill skill) => 700; + public override int GetCoolingtime(Skill skill) => 6000; public float GetRadius(Skill skill) => 8f; public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 120); - public float GetPraydistance(Skill skill) => (float)(skill.GetPlayer().GetRange()); - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => (float)(skill.GetPlayer().GetRange()); + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) diff --git a/Assets/PerfectWorld/Scripts/Skills/skill387.cs b/Assets/PerfectWorld/Scripts/Skills/skill387.cs index d9191dd1e0..b07591f401 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill387.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill387.cs @@ -85,8 +85,8 @@ namespace BrewMonster public Skill387Stub() : base(387) { cls = 0; - name = "狂・狂龙斩"; - nativename = "狂・狂龙斩"; + name = "狂·狂龙斩"; + nativename = "狂·狂龙斩"; icon = "狂龙斩2.dds"; max_level = 1; type = 1; @@ -108,10 +108,21 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; + effect = "2狂龙斩.sgc"; + doenchant = 0; + dobless = 0; + commoncooldown = 0; + commoncooldowntime = 0; restrict_weapons.Add(0); - effect = ""; + restrict_weapons.Add(1); + restrict_weapons.Add(182); + restrict_weapons.Add(5); + restrict_weapons.Add(292); + restrict_weapons.Add(9); range = new Range(); - range.type = 0; + range.type = 4; + pre_skills = new Dictionary(); + pre_skills.Add(55, 10); #if SKILL_SERVER statestub.Add(new State1()); statestub.Add(new State2()); @@ -121,17 +132,17 @@ namespace BrewMonster ~Skill387Stub() { } - public float GetMpcost(Skill skill) => 210f; - public int GetExecutetime(Skill skill) => 700; - public int GetCoolingtime(Skill skill) => 8000; + public override float GetMpcost(Skill skill) => 210f; + public override int GetExecutetime(Skill skill) => 700; + public override int GetCoolingtime(Skill skill) => 8000; public float GetRadius(Skill skill) => 12f; public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 120); - public float GetPraydistance(Skill skill) => (float)(skill.GetPlayer().GetRange()); - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => (float)(skill.GetPlayer().GetRange()); + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) diff --git a/Assets/PerfectWorld/Scripts/Skills/skill388.cs b/Assets/PerfectWorld/Scripts/Skills/skill388.cs index e5b7d7b501..a1c96e6811 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill388.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill388.cs @@ -85,8 +85,8 @@ namespace BrewMonster public Skill388Stub() : base(388) { cls = 0; - name = "真・横扫千军"; - nativename = "真・横扫千军"; + name = "真·横扫千军"; + nativename = "真·横扫千军"; icon = "横扫千军1.dds"; max_level = 1; type = 1; @@ -108,10 +108,21 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; + effect = "1横扫千军.sgc"; + doenchant = 0; + dobless = 0; + commoncooldown = 0; + commoncooldowntime = 0; restrict_weapons.Add(0); - effect = ""; + restrict_weapons.Add(1); + restrict_weapons.Add(182); + restrict_weapons.Add(5); + restrict_weapons.Add(292); + restrict_weapons.Add(9); range = new Range(); - range.type = 0; + range.type = 2; + pre_skills = new Dictionary(); + pre_skills.Add(56, 10); #if SKILL_SERVER statestub.Add(new State1()); statestub.Add(new State2()); @@ -121,17 +132,17 @@ namespace BrewMonster ~Skill388Stub() { } - public float GetMpcost(Skill skill) => 210f; - public int GetExecutetime(Skill skill) => 900; - public int GetCoolingtime(Skill skill) => 8000; + public override float GetMpcost(Skill skill) => 210f; + public override int GetExecutetime(Skill skill) => 900; + public override int GetCoolingtime(Skill skill) => 8000; public float GetRadius(Skill skill) => 8f; public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => (float)(skill.GetPlayer().GetRange()); - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => (float)(skill.GetPlayer().GetRange()); + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) diff --git a/Assets/PerfectWorld/Scripts/Skills/skill389.cs b/Assets/PerfectWorld/Scripts/Skills/skill389.cs index 836c60bd30..cafae4b052 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill389.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill389.cs @@ -85,8 +85,8 @@ namespace BrewMonster public Skill389Stub() : base(389) { cls = 0; - name = "狂・横扫千军"; - nativename = "狂・横扫千军"; + name = "狂·横扫千军"; + nativename = "狂·横扫千军"; icon = "横扫千军2.dds"; max_level = 1; type = 1; @@ -108,10 +108,21 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; + effect = "2横扫千军.sgc"; + doenchant = 0; + dobless = 1; + commoncooldown = 0; + commoncooldowntime = 0; restrict_weapons.Add(0); - effect = ""; + restrict_weapons.Add(1); + restrict_weapons.Add(182); + restrict_weapons.Add(5); + restrict_weapons.Add(292); + restrict_weapons.Add(9); range = new Range(); - range.type = 0; + range.type = 2; + pre_skills = new Dictionary(); + pre_skills.Add(56, 10); #if SKILL_SERVER statestub.Add(new State1()); statestub.Add(new State2()); @@ -121,17 +132,17 @@ namespace BrewMonster ~Skill389Stub() { } - public float GetMpcost(Skill skill) => 210f; - public int GetExecutetime(Skill skill) => 900; - public int GetCoolingtime(Skill skill) => 8000; + public override float GetMpcost(Skill skill) => 210f; + public override int GetExecutetime(Skill skill) => 900; + public override int GetCoolingtime(Skill skill) => 8000; public float GetRadius(Skill skill) => 8f; public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => (float)(skill.GetPlayer().GetRange()); - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => (float)(skill.GetPlayer().GetRange()); + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) @@ -148,10 +159,7 @@ namespace BrewMonster #if SKILL_SERVER public int GetEnmity(Skill skill) => 0; - public bool BlessMe(Skill skill) - { - return true; - } + public bool BlessMe(Skill skill) => true; public bool TakeEffect(Skill skill) => true; public float GetEffectdistance(Skill skill) => 5f; public int GetAttackspeed(Skill skill) => 6; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill390.cs b/Assets/PerfectWorld/Scripts/Skills/skill390.cs index 35ff872dfc..6626b60838 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill390.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill390.cs @@ -85,8 +85,8 @@ namespace BrewMonster public Skill390Stub() : base(390) { cls = 0; - name = "真・劈空掌"; - nativename = "真・劈空掌"; + name = "真·劈空掌"; + nativename = "真·劈空掌"; icon = "劈空掌1.dds"; max_level = 1; type = 1; @@ -108,10 +108,17 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; + effect = "1劈空掌.sgc"; + doenchant = 1; + dobless = 1; + commoncooldown = 0; + commoncooldowntime = 0; restrict_weapons.Add(182); - effect = ""; + restrict_weapons.Add(0); range = new Range(); range.type = 0; + pre_skills = new Dictionary(); + pre_skills.Add(60, 10); #if SKILL_SERVER statestub.Add(new State1()); statestub.Add(new State2()); @@ -121,17 +128,17 @@ namespace BrewMonster ~Skill390Stub() { } - public float GetMpcost(Skill skill) => 140f; - public int GetExecutetime(Skill skill) => 700; - public int GetCoolingtime(Skill skill) => 15000; + public override float GetMpcost(Skill skill) => 140f; + public override int GetExecutetime(Skill skill) => 700; + public override int GetCoolingtime(Skill skill) => 15000; public float GetRadius(Skill skill) => 0f; public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => (float)(skill.GetPlayer().GetRange()); - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => (float)(skill.GetPlayer().GetRange()); + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) @@ -148,14 +155,8 @@ namespace BrewMonster #if SKILL_SERVER public int GetEnmity(Skill skill) => 3000; - public bool StateAttack(Skill skill) - { - return true; - } - public bool BlessMe(Skill skill) - { - return true; - } + public bool StateAttack(Skill skill) => true; + public bool BlessMe(Skill skill) => true; public bool TakeEffect(Skill skill) => true; public float GetEffectdistance(Skill skill) => 12.5f; public int GetAttackspeed(Skill skill) => 10; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill391.cs b/Assets/PerfectWorld/Scripts/Skills/skill391.cs index 57cc157cc4..1265f85ec1 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill391.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill391.cs @@ -128,17 +128,17 @@ namespace BrewMonster ~Skill391Stub() { } - public float GetMpcost(Skill skill) => 140f; - public int GetExecutetime(Skill skill) => 700; - public int GetCoolingtime(Skill skill) => 15000; + public override float GetMpcost(Skill skill) => 140f; + public override int GetExecutetime(Skill skill) => 700; + public override int GetCoolingtime(Skill skill) => 15000; public float GetRadius(Skill skill) => 0f; public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => (float)(skill.GetPlayer().GetRange()); - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => (float)(skill.GetPlayer().GetRange()); + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) diff --git a/Assets/PerfectWorld/Scripts/Skills/skill392.cs b/Assets/PerfectWorld/Scripts/Skills/skill392.cs index 5e74c64140..44a6051064 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill392.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill392.cs @@ -128,17 +128,17 @@ namespace BrewMonster ~Skill392Stub() { } - public float GetMpcost(Skill skill) => 165f; - public int GetExecutetime(Skill skill) => 1200; - public int GetCoolingtime(Skill skill) => 10000; + public override float GetMpcost(Skill skill) => 165f; + public override int GetExecutetime(Skill skill) => 1200; + public override int GetCoolingtime(Skill skill) => 10000; public float GetRadius(Skill skill) => 0f; public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => (float)(skill.GetPlayer().GetRange()); - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => (float)(skill.GetPlayer().GetRange()); + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) diff --git a/Assets/PerfectWorld/Scripts/Skills/skill393.cs b/Assets/PerfectWorld/Scripts/Skills/skill393.cs index 38bb5269a5..c03e0cdd06 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill393.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill393.cs @@ -128,17 +128,17 @@ namespace BrewMonster ~Skill393Stub() { } - public float GetMpcost(Skill skill) => 165f; - public int GetExecutetime(Skill skill) => 1200; - public int GetCoolingtime(Skill skill) => 12000; + public override float GetMpcost(Skill skill) => 165f; + public override int GetExecutetime(Skill skill) => 1200; + public override int GetCoolingtime(Skill skill) => 12000; public float GetRadius(Skill skill) => 3f; public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => (float)(skill.GetPlayer().GetRange()); - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => (float)(skill.GetPlayer().GetRange()); + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) diff --git a/Assets/PerfectWorld/Scripts/Skills/skill394.cs b/Assets/PerfectWorld/Scripts/Skills/skill394.cs index 1a4b21f041..0ad29e0718 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill394.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill394.cs @@ -128,17 +128,17 @@ namespace BrewMonster ~Skill394Stub() { } - public float GetMpcost(Skill skill) => 210f; - public int GetExecutetime(Skill skill) => 1800; - public int GetCoolingtime(Skill skill) => 15000; + public override float GetMpcost(Skill skill) => 210f; + public override int GetExecutetime(Skill skill) => 1800; + public override int GetCoolingtime(Skill skill) => 15000; public float GetRadius(Skill skill) => 8f; public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => (float)(skill.GetPlayer().GetRange()); - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => (float)(skill.GetPlayer().GetRange()); + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) diff --git a/Assets/PerfectWorld/Scripts/Skills/skill395.cs b/Assets/PerfectWorld/Scripts/Skills/skill395.cs index 107f1de007..95ccca7de2 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill395.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill395.cs @@ -128,17 +128,17 @@ namespace BrewMonster ~Skill395Stub() { } - public float GetMpcost(Skill skill) => 210f; - public int GetExecutetime(Skill skill) => 1800; - public int GetCoolingtime(Skill skill) => 15000; + public override float GetMpcost(Skill skill) => 210f; + public override int GetExecutetime(Skill skill) => 1800; + public override int GetCoolingtime(Skill skill) => 15000; public float GetRadius(Skill skill) => 8f; public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => (float)(skill.GetPlayer().GetRange()); - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => (float)(skill.GetPlayer().GetRange()); + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) diff --git a/Assets/PerfectWorld/Scripts/Skills/skill396.cs b/Assets/PerfectWorld/Scripts/Skills/skill396.cs index d0ccb59ec6..07ccedbad9 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill396.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill396.cs @@ -128,17 +128,17 @@ namespace BrewMonster ~Skill396Stub() { } - public float GetMpcost(Skill skill) => 305f; - public int GetExecutetime(Skill skill) => 1000; - public int GetCoolingtime(Skill skill) => 30000; + public override float GetMpcost(Skill skill) => 305f; + public override int GetExecutetime(Skill skill) => 1000; + public override int GetCoolingtime(Skill skill) => 30000; public float GetRadius(Skill skill) => 4f; public float GetAttackdistance(Skill skill) => 12f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => (float)(skill.GetPlayer().GetRange()); - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => (float)(skill.GetPlayer().GetRange()); + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) diff --git a/Assets/PerfectWorld/Scripts/Skills/skill397.cs b/Assets/PerfectWorld/Scripts/Skills/skill397.cs index 62c1a279be..dd6ca4cde3 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill397.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill397.cs @@ -128,17 +128,17 @@ namespace BrewMonster ~Skill397Stub() { } - public float GetMpcost(Skill skill) => 305f; - public int GetExecutetime(Skill skill) => 1000; - public int GetCoolingtime(Skill skill) => 30000; + public override float GetMpcost(Skill skill) => 305f; + public override int GetExecutetime(Skill skill) => 1000; + public override int GetCoolingtime(Skill skill) => 30000; public float GetRadius(Skill skill) => 4f; public float GetAttackdistance(Skill skill) => 12f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => (float)(skill.GetPlayer().GetRange()); - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => (float)(skill.GetPlayer().GetRange()); + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) diff --git a/Assets/PerfectWorld/Scripts/Skills/skill398.cs b/Assets/PerfectWorld/Scripts/Skills/skill398.cs index d8b626ed19..a016f15605 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill398.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill398.cs @@ -128,17 +128,17 @@ namespace BrewMonster ~Skill398Stub() { } - public float GetMpcost(Skill skill) => 140f; - public int GetExecutetime(Skill skill) => 800; - public int GetCoolingtime(Skill skill) => 15000; + public override float GetMpcost(Skill skill) => 140f; + public override int GetExecutetime(Skill skill) => 800; + public override int GetCoolingtime(Skill skill) => 15000; public float GetRadius(Skill skill) => 3.5f; public float GetAttackdistance(Skill skill) => 12f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => (float)(skill.GetPlayer().GetRange()); - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => (float)(skill.GetPlayer().GetRange()); + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) diff --git a/Assets/PerfectWorld/Scripts/Skills/skill399.cs b/Assets/PerfectWorld/Scripts/Skills/skill399.cs index 5f9370b935..8a2874b0c6 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill399.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill399.cs @@ -128,17 +128,17 @@ namespace BrewMonster ~Skill399Stub() { } - public float GetMpcost(Skill skill) => 140f; - public int GetExecutetime(Skill skill) => 800; - public int GetCoolingtime(Skill skill) => 15000; + public override float GetMpcost(Skill skill) => 140f; + public override int GetExecutetime(Skill skill) => 800; + public override int GetCoolingtime(Skill skill) => 15000; public float GetRadius(Skill skill) => 5f; public float GetAttackdistance(Skill skill) => 15f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => (float)(skill.GetPlayer().GetRange()); - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => (float)(skill.GetPlayer().GetRange()); + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) diff --git a/Assets/PerfectWorld/Scripts/Skills/skill4.cs b/Assets/PerfectWorld/Scripts/Skills/skill4.cs index 2a3a5ddb04..5156d599e4 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill4.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill4.cs @@ -104,10 +104,21 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; + effect = "狮子吼.sgc"; + doenchant = 1; + dobless = 0; + commoncooldown = 0; + commoncooldowntime = 0; restrict_weapons.Add(0); - effect = ""; + restrict_weapons.Add(1); + restrict_weapons.Add(182); + restrict_weapons.Add(5); + restrict_weapons.Add(292); + restrict_weapons.Add(9); range = new Range(); - range.type = 0; + range.type = 2; + pre_skills = new Dictionary(); + pre_skills.Add(0, 1); #if SKILL_SERVER statestub.Add(new State1()); statestub.Add(new State2()); @@ -117,16 +128,16 @@ namespace BrewMonster ~Skill4Stub() { } - public float GetMpcost(Skill skill) => (float)(35.3 + 9.8 * skill.GetLevel()); - public int GetExecutetime(Skill skill) => 1800; - public int GetCoolingtime(Skill skill) => 25000 - 1000 * skill.GetLevel(); + public override float GetMpcost(Skill skill) => (float)(35.3 + 9.8 * skill.GetLevel()); + public override int GetExecutetime(Skill skill) => 1800; + public override int GetCoolingtime(Skill skill) => 25000 - 1000 * skill.GetLevel(); public float GetRadius(Skill skill) => 10f; public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => 5f; - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => 5f; + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) @@ -147,10 +158,7 @@ namespace BrewMonster #if SKILL_SERVER public int GetEnmity(Skill skill) => 600; - public bool StateAttack(Skill skill) - { - return true; - } + public bool StateAttack(Skill skill) => true; public bool TakeEffect(Skill skill) => true; public float GetEffectdistance(Skill skill) => 20f; public int GetAttackspeed(Skill skill) => 9; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill400.cs b/Assets/PerfectWorld/Scripts/Skills/skill400.cs index 9495b8af48..c744caa8b8 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill400.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill400.cs @@ -127,17 +127,17 @@ namespace BrewMonster ~Skill400Stub() { } - public float GetMpcost(Skill skill) => 165f; - public int GetExecutetime(Skill skill) => 1200; - public int GetCoolingtime(Skill skill) => 6000; + public override float GetMpcost(Skill skill) => 165f; + public override int GetExecutetime(Skill skill) => 1200; + public override int GetCoolingtime(Skill skill) => 6000; public float GetRadius(Skill skill) => 0f; public float GetAttackdistance(Skill skill) => (float)(skill.GetPlayer().GetRange() + 0.3 * skill.GetLevel()); public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => (float)(16 + skill.GetPlayer().GetRange() - 4.5); - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => (float)(16 + skill.GetPlayer().GetRange() - 4.5); + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) diff --git a/Assets/PerfectWorld/Scripts/Skills/skill401.cs b/Assets/PerfectWorld/Scripts/Skills/skill401.cs index 0e185c93d4..1f0ceccca2 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill401.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill401.cs @@ -127,17 +127,17 @@ namespace BrewMonster ~Skill401Stub() { } - public float GetMpcost(Skill skill) => 165f; - public int GetExecutetime(Skill skill) => 1200; - public int GetCoolingtime(Skill skill) => 6000; + public override float GetMpcost(Skill skill) => 165f; + public override int GetExecutetime(Skill skill) => 1200; + public override int GetCoolingtime(Skill skill) => 6000; public float GetRadius(Skill skill) => 0f; public float GetAttackdistance(Skill skill) => (float)(skill.GetPlayer().GetRange() + 0.3 * skill.GetLevel()); public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => (float)(18 + skill.GetPlayer().GetRange() - 4.5); - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => (float)(18 + skill.GetPlayer().GetRange() - 4.5); + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) diff --git a/Assets/PerfectWorld/Scripts/Skills/skill402.cs b/Assets/PerfectWorld/Scripts/Skills/skill402.cs index 277eca1435..ca6e8ea598 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill402.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill402.cs @@ -127,17 +127,17 @@ namespace BrewMonster ~Skill402Stub() { } - public float GetMpcost(Skill skill) => 165f; - public int GetExecutetime(Skill skill) => 800; - public int GetCoolingtime(Skill skill) => 6000; + public override float GetMpcost(Skill skill) => 165f; + public override int GetExecutetime(Skill skill) => 800; + public override int GetCoolingtime(Skill skill) => 6000; public float GetRadius(Skill skill) => 3.5f; public float GetAttackdistance(Skill skill) => 15f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => (float)(skill.GetPlayer().GetRange()); - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => (float)(skill.GetPlayer().GetRange()); + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) diff --git a/Assets/PerfectWorld/Scripts/Skills/skill403.cs b/Assets/PerfectWorld/Scripts/Skills/skill403.cs index 4cbcb84d46..44cf5278a1 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill403.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill403.cs @@ -127,17 +127,17 @@ namespace BrewMonster ~Skill403Stub() { } - public float GetMpcost(Skill skill) => 165f; - public int GetExecutetime(Skill skill) => 800; - public int GetCoolingtime(Skill skill) => 6000; + public override float GetMpcost(Skill skill) => 165f; + public override int GetExecutetime(Skill skill) => 800; + public override int GetCoolingtime(Skill skill) => 6000; public float GetRadius(Skill skill) => 3.5f; public float GetAttackdistance(Skill skill) => 15f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => (float)(skill.GetPlayer().GetRange()); - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => (float)(skill.GetPlayer().GetRange()); + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) diff --git a/Assets/PerfectWorld/Scripts/Skills/skill404.cs b/Assets/PerfectWorld/Scripts/Skills/skill404.cs index d442027fd8..9bc7c03bbe 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill404.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill404.cs @@ -127,17 +127,17 @@ namespace BrewMonster ~Skill404Stub() { } - public float GetMpcost(Skill skill) => 305f; - public int GetExecutetime(Skill skill) => 1800; - public int GetCoolingtime(Skill skill) => 30000; + public override float GetMpcost(Skill skill) => 305f; + public override int GetExecutetime(Skill skill) => 1800; + public override int GetCoolingtime(Skill skill) => 30000; public float GetRadius(Skill skill) => 12f; public float GetAttackdistance(Skill skill) => (float)(skill.GetPlayer().GetRange() + 0.4 * skill.GetLevel()); public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => (float)(skill.GetPlayer().GetRange()); - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => (float)(skill.GetPlayer().GetRange()); + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) diff --git a/Assets/PerfectWorld/Scripts/Skills/skill405.cs b/Assets/PerfectWorld/Scripts/Skills/skill405.cs index 4e4421d827..863bef8fe7 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill405.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill405.cs @@ -127,17 +127,17 @@ namespace BrewMonster ~Skill405Stub() { } - public float GetMpcost(Skill skill) => 305f; - public int GetExecutetime(Skill skill) => 1800; - public int GetCoolingtime(Skill skill) => 30000; + public override float GetMpcost(Skill skill) => 305f; + public override int GetExecutetime(Skill skill) => 1800; + public override int GetCoolingtime(Skill skill) => 30000; public float GetRadius(Skill skill) => 12f; public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => (float)(skill.GetPlayer().GetRange()); - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => (float)(skill.GetPlayer().GetRange()); + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) diff --git a/Assets/PerfectWorld/Scripts/Skills/skill406.cs b/Assets/PerfectWorld/Scripts/Skills/skill406.cs index 7488f5e1ad..d0a571ba54 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill406.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill406.cs @@ -128,17 +128,17 @@ namespace BrewMonster ~Skill406Stub() { } - public float GetMpcost(Skill skill) => 140f; - public int GetExecutetime(Skill skill) => 1500; - public int GetCoolingtime(Skill skill) => 15000; + public override float GetMpcost(Skill skill) => 140f; + public override int GetExecutetime(Skill skill) => 1500; + public override int GetCoolingtime(Skill skill) => 15000; public float GetRadius(Skill skill) => 0f; public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => (float)(skill.GetPlayer().GetRange()); - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => (float)(skill.GetPlayer().GetRange()); + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) diff --git a/Assets/PerfectWorld/Scripts/Skills/skill407.cs b/Assets/PerfectWorld/Scripts/Skills/skill407.cs index dbcd8181b6..d434518d0a 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill407.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill407.cs @@ -128,17 +128,17 @@ namespace BrewMonster ~Skill407Stub() { } - public float GetMpcost(Skill skill) => 140f; - public int GetExecutetime(Skill skill) => 1500; - public int GetCoolingtime(Skill skill) => 15000; + public override float GetMpcost(Skill skill) => 140f; + public override int GetExecutetime(Skill skill) => 1500; + public override int GetCoolingtime(Skill skill) => 15000; public float GetRadius(Skill skill) => 0f; public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => (float)(skill.GetPlayer().GetRange()); - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => (float)(skill.GetPlayer().GetRange()); + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) diff --git a/Assets/PerfectWorld/Scripts/Skills/skill408.cs b/Assets/PerfectWorld/Scripts/Skills/skill408.cs index 1b6edfc2f6..b641a04c1b 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill408.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill408.cs @@ -127,17 +127,17 @@ namespace BrewMonster ~Skill408Stub() { } - public float GetMpcost(Skill skill) => 210f; - public int GetExecutetime(Skill skill) => 2000; - public int GetCoolingtime(Skill skill) => 6000; + public override float GetMpcost(Skill skill) => 210f; + public override int GetExecutetime(Skill skill) => 2000; + public override int GetCoolingtime(Skill skill) => 6000; public float GetRadius(Skill skill) => 10f; public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 *(20 + 3 * skill.GetLevel())); - public float GetPraydistance(Skill skill) => (float)(skill.GetPlayer().GetRange()); - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => (float)(skill.GetPlayer().GetRange()); + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) diff --git a/Assets/PerfectWorld/Scripts/Skills/skill409.cs b/Assets/PerfectWorld/Scripts/Skills/skill409.cs index 73e89f3799..52374b87ba 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill409.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill409.cs @@ -127,17 +127,17 @@ namespace BrewMonster ~Skill409Stub() { } - public float GetMpcost(Skill skill) => 210f; - public int GetExecutetime(Skill skill) => 2000; - public int GetCoolingtime(Skill skill) => 6000; + public override float GetMpcost(Skill skill) => 210f; + public override int GetExecutetime(Skill skill) => 2000; + public override int GetCoolingtime(Skill skill) => 6000; public float GetRadius(Skill skill) => 10f; public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 *(20 + 3 * skill.GetLevel())); - public float GetPraydistance(Skill skill) => (float)(skill.GetPlayer().GetRange()); - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => (float)(skill.GetPlayer().GetRange()); + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) diff --git a/Assets/PerfectWorld/Scripts/Skills/skill410.cs b/Assets/PerfectWorld/Scripts/Skills/skill410.cs index 334879ea70..d42c81a88d 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill410.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill410.cs @@ -127,17 +127,17 @@ namespace BrewMonster ~Skill410Stub() { } - public float GetMpcost(Skill skill) => 210f; - public int GetExecutetime(Skill skill) => 1400; - public int GetCoolingtime(Skill skill) => 8000; + public override float GetMpcost(Skill skill) => 210f; + public override int GetExecutetime(Skill skill) => 1400; + public override int GetCoolingtime(Skill skill) => 8000; public float GetRadius(Skill skill) => 10f; public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 *(20 + 3 * skill.GetLevel())); - public float GetPraydistance(Skill skill) => (float)(skill.GetPlayer().GetRange()); - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => (float)(skill.GetPlayer().GetRange()); + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) diff --git a/Assets/PerfectWorld/Scripts/Skills/skill411.cs b/Assets/PerfectWorld/Scripts/Skills/skill411.cs index da7f251cfe..a4dbe51b55 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill411.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill411.cs @@ -127,17 +127,17 @@ namespace BrewMonster ~Skill411Stub() { } - public float GetMpcost(Skill skill) => 210f; - public int GetExecutetime(Skill skill) => 1400; - public int GetCoolingtime(Skill skill) => 8000; + public override float GetMpcost(Skill skill) => 210f; + public override int GetExecutetime(Skill skill) => 1400; + public override int GetCoolingtime(Skill skill) => 8000; public float GetRadius(Skill skill) => 10f; public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 *(20 + 3 * skill.GetLevel())); - public float GetPraydistance(Skill skill) => (float)(skill.GetPlayer().GetRange()); - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => (float)(skill.GetPlayer().GetRange()); + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) diff --git a/Assets/PerfectWorld/Scripts/Skills/skill412.cs b/Assets/PerfectWorld/Scripts/Skills/skill412.cs index c674031719..13f16c7a2a 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill412.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill412.cs @@ -127,17 +127,17 @@ namespace BrewMonster ~Skill412Stub() { } - public float GetMpcost(Skill skill) => 305f; - public int GetExecutetime(Skill skill) => 1500; - public int GetCoolingtime(Skill skill) => 30000; + public override float GetMpcost(Skill skill) => 305f; + public override int GetExecutetime(Skill skill) => 1500; + public override int GetCoolingtime(Skill skill) => 30000; public float GetRadius(Skill skill) => 12f; public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 *(60 + 2.5 * skill.GetLevel())); - public float GetPraydistance(Skill skill) => 8f; - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => 8f; + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) diff --git a/Assets/PerfectWorld/Scripts/Skills/skill413.cs b/Assets/PerfectWorld/Scripts/Skills/skill413.cs index 1382b20e93..7db3c5f3bc 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill413.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill413.cs @@ -127,17 +127,17 @@ namespace BrewMonster ~Skill413Stub() { } - public float GetMpcost(Skill skill) => 304f; - public int GetExecutetime(Skill skill) => 1500; - public int GetCoolingtime(Skill skill) => 30000; + public override float GetMpcost(Skill skill) => 304f; + public override int GetExecutetime(Skill skill) => 1500; + public override int GetCoolingtime(Skill skill) => 30000; public float GetRadius(Skill skill) => 12f; public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 *(60 + 2.5 * skill.GetLevel())); - public float GetPraydistance(Skill skill) => 8f; - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => 8f; + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) diff --git a/Assets/PerfectWorld/Scripts/Skills/skill414.cs b/Assets/PerfectWorld/Scripts/Skills/skill414.cs index caa214ae2d..e8bb4b572e 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill414.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill414.cs @@ -128,17 +128,17 @@ namespace BrewMonster ~Skill414Stub() { } - public float GetMpcost(Skill skill) => 140f; - public int GetExecutetime(Skill skill) => 700; - public int GetCoolingtime(Skill skill) => 15000; + public override float GetMpcost(Skill skill) => 140f; + public override int GetExecutetime(Skill skill) => 700; + public override int GetCoolingtime(Skill skill) => 15000; public float GetRadius(Skill skill) => 0f; public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => (float)(skill.GetPlayer().GetRange()); - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => (float)(skill.GetPlayer().GetRange()); + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) diff --git a/Assets/PerfectWorld/Scripts/Skills/skill415.cs b/Assets/PerfectWorld/Scripts/Skills/skill415.cs index 0ebd532ea5..5fd834799c 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill415.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill415.cs @@ -128,17 +128,17 @@ namespace BrewMonster ~Skill415Stub() { } - public float GetMpcost(Skill skill) => 140f; - public int GetExecutetime(Skill skill) => 700; - public int GetCoolingtime(Skill skill) => 15000; + public override float GetMpcost(Skill skill) => 140f; + public override int GetExecutetime(Skill skill) => 700; + public override int GetCoolingtime(Skill skill) => 15000; public float GetRadius(Skill skill) => 3f; public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => (float)(skill.GetPlayer().GetRange()); - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => (float)(skill.GetPlayer().GetRange()); + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) diff --git a/Assets/PerfectWorld/Scripts/Skills/skill416.cs b/Assets/PerfectWorld/Scripts/Skills/skill416.cs index 441fd4cef7..fd037961b7 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill416.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill416.cs @@ -128,17 +128,17 @@ namespace BrewMonster ~Skill416Stub() { } - public float GetMpcost(Skill skill) => 140f; - public int GetExecutetime(Skill skill) => 800; - public int GetCoolingtime(Skill skill) => 6000; + public override float GetMpcost(Skill skill) => 140f; + public override int GetExecutetime(Skill skill) => 800; + public override int GetCoolingtime(Skill skill) => 6000; public float GetRadius(Skill skill) => 0f; public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => (float)(12 + skill.GetPlayer().GetRange() - 3); - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => (float)(12 + skill.GetPlayer().GetRange() - 3); + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) diff --git a/Assets/PerfectWorld/Scripts/Skills/skill417.cs b/Assets/PerfectWorld/Scripts/Skills/skill417.cs index 5e4d124b0d..a37bb695ab 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill417.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill417.cs @@ -128,17 +128,17 @@ namespace BrewMonster ~Skill417Stub() { } - public float GetMpcost(Skill skill) => 140f; - public int GetExecutetime(Skill skill) => 900; - public int GetCoolingtime(Skill skill) => 6000; + public override float GetMpcost(Skill skill) => 140f; + public override int GetExecutetime(Skill skill) => 900; + public override int GetCoolingtime(Skill skill) => 6000; public float GetRadius(Skill skill) => 0f; public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => (float)(12 + skill.GetPlayer().GetRange() - 3); - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => (float)(12 + skill.GetPlayer().GetRange() - 3); + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) diff --git a/Assets/PerfectWorld/Scripts/Skills/skill418.cs b/Assets/PerfectWorld/Scripts/Skills/skill418.cs index 75207415c7..d0d8235475 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill418.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill418.cs @@ -127,17 +127,17 @@ namespace BrewMonster ~Skill418Stub() { } - public float GetMpcost(Skill skill) => 140f; - public int GetExecutetime(Skill skill) => 1700; - public int GetCoolingtime(Skill skill) => 8000; + public override float GetMpcost(Skill skill) => 140f; + public override int GetExecutetime(Skill skill) => 1700; + public override int GetCoolingtime(Skill skill) => 8000; public float GetRadius(Skill skill) => 0f; public float GetAttackdistance(Skill skill) => (float)(skill.GetPlayer().GetRange() + 3 + 0.3 * skill.GetLevel()); public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => (float)(skill.GetPlayer().GetRange()); - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => (float)(skill.GetPlayer().GetRange()); + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) diff --git a/Assets/PerfectWorld/Scripts/Skills/skill419.cs b/Assets/PerfectWorld/Scripts/Skills/skill419.cs index 475f81654f..12d6f63f98 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill419.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill419.cs @@ -127,17 +127,17 @@ namespace BrewMonster ~Skill419Stub() { } - public float GetMpcost(Skill skill) => 140f; - public int GetExecutetime(Skill skill) => 1700; - public int GetCoolingtime(Skill skill) => 8000; + public override float GetMpcost(Skill skill) => 140f; + public override int GetExecutetime(Skill skill) => 1700; + public override int GetCoolingtime(Skill skill) => 8000; public float GetRadius(Skill skill) => 0f; public float GetAttackdistance(Skill skill) => (float)(skill.GetPlayer().GetRange() + 3 + 0.3 * skill.GetLevel()); public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => (float)(skill.GetPlayer().GetRange()); - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => (float)(skill.GetPlayer().GetRange()); + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) diff --git a/Assets/PerfectWorld/Scripts/Skills/skill420.cs b/Assets/PerfectWorld/Scripts/Skills/skill420.cs index ec506a8031..0e298682a3 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill420.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill420.cs @@ -128,17 +128,17 @@ namespace BrewMonster ~Skill420Stub() { } - public float GetMpcost(Skill skill) => 305f; - public int GetExecutetime(Skill skill) => 3000; - public int GetCoolingtime(Skill skill) => 30000; + public override float GetMpcost(Skill skill) => 305f; + public override int GetExecutetime(Skill skill) => 3000; + public override int GetCoolingtime(Skill skill) => 30000; public float GetRadius(Skill skill) => 12f; public float GetAttackdistance(Skill skill) => (float)(skill.GetPlayer().GetRange() + 0.4 * skill.GetLevel()); public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => (float)(10 + skill.GetPlayer().GetRange() - 3); - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => (float)(10 + skill.GetPlayer().GetRange() - 3); + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) diff --git a/Assets/PerfectWorld/Scripts/Skills/skill421.cs b/Assets/PerfectWorld/Scripts/Skills/skill421.cs index 8bc3c8ba57..5d076c368b 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill421.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill421.cs @@ -128,17 +128,17 @@ namespace BrewMonster ~Skill421Stub() { } - public float GetMpcost(Skill skill) => 305f; - public int GetExecutetime(Skill skill) => 3000; - public int GetCoolingtime(Skill skill) => 30000; + public override float GetMpcost(Skill skill) => 305f; + public override int GetExecutetime(Skill skill) => 3000; + public override int GetCoolingtime(Skill skill) => 30000; public float GetRadius(Skill skill) => 12f; public float GetAttackdistance(Skill skill) => (float)(skill.GetPlayer().GetRange() + 0.4 * skill.GetLevel()); public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => (float)(10 + skill.GetPlayer().GetRange() - 3); - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => (float)(10 + skill.GetPlayer().GetRange() - 3); + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) diff --git a/Assets/PerfectWorld/Scripts/Skills/skill422.cs b/Assets/PerfectWorld/Scripts/Skills/skill422.cs index 00ff545d24..d0231fad31 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill422.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill422.cs @@ -129,17 +129,17 @@ namespace BrewMonster ~Skill422Stub() { } - public float GetMpcost(Skill skill) => 625f; - public int GetExecutetime(Skill skill) => 1800; - public int GetCoolingtime(Skill skill) => 3000; + public override float GetMpcost(Skill skill) => 625f; + public override int GetExecutetime(Skill skill) => 1800; + public override int GetCoolingtime(Skill skill) => 3000; public float GetRadius(Skill skill) => 16f; public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => 0f; - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => 0f; + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) diff --git a/Assets/PerfectWorld/Scripts/Skills/skill423.cs b/Assets/PerfectWorld/Scripts/Skills/skill423.cs index 9f4173201f..d817cc4531 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill423.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill423.cs @@ -129,17 +129,17 @@ namespace BrewMonster ~Skill423Stub() { } - public float GetMpcost(Skill skill) => 625f; - public int GetExecutetime(Skill skill) => 1800; - public int GetCoolingtime(Skill skill) => 3000; + public override float GetMpcost(Skill skill) => 625f; + public override int GetExecutetime(Skill skill) => 1800; + public override int GetCoolingtime(Skill skill) => 3000; public float GetRadius(Skill skill) => 16f; public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => 0f; - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => 0f; + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) diff --git a/Assets/PerfectWorld/Scripts/Skills/skill424.cs b/Assets/PerfectWorld/Scripts/Skills/skill424.cs index fca877e5b5..3913d82ec7 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill424.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill424.cs @@ -130,17 +130,17 @@ namespace BrewMonster ~Skill424Stub() { } - public float GetMpcost(Skill skill) => 175f; - public int GetExecutetime(Skill skill) => 1800; - public int GetCoolingtime(Skill skill) => 15000; + public override float GetMpcost(Skill skill) => 175f; + public override int GetExecutetime(Skill skill) => 1800; + public override int GetCoolingtime(Skill skill) => 15000; public float GetRadius(Skill skill) => 10f; public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => 5f; - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => 5f; + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) diff --git a/Assets/PerfectWorld/Scripts/Skills/skill425.cs b/Assets/PerfectWorld/Scripts/Skills/skill425.cs index 3417f593b2..f311afe5cf 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill425.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill425.cs @@ -129,17 +129,17 @@ namespace BrewMonster ~Skill425Stub() { } - public float GetMpcost(Skill skill) => 175f; - public int GetExecutetime(Skill skill) => 1800; - public int GetCoolingtime(Skill skill) => 14000; + public override float GetMpcost(Skill skill) => 175f; + public override int GetExecutetime(Skill skill) => 1800; + public override int GetCoolingtime(Skill skill) => 14000; public float GetRadius(Skill skill) => 10f; public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => 5f; - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => 5f; + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) diff --git a/Assets/PerfectWorld/Scripts/Skills/skill426.cs b/Assets/PerfectWorld/Scripts/Skills/skill426.cs index e2e6966bdb..fd7d9af9a4 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill426.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill426.cs @@ -93,17 +93,17 @@ namespace BrewMonster ~Skill426Stub() { } - public float GetMpcost(Skill skill) => 20f; - public int GetExecutetime(Skill skill) => 0; - public int GetCoolingtime(Skill skill) => 10000; + public override float GetMpcost(Skill skill) => 20f; + public override int GetExecutetime(Skill skill) => 0; + public override int GetCoolingtime(Skill skill) => 10000; public float GetRadius(Skill skill) => 0f; public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => 0f; - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => 0f; + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_SERVER public int GetEnmity(Skill skill) => 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill427.cs b/Assets/PerfectWorld/Scripts/Skills/skill427.cs index 7023eb1025..7025899a14 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill427.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill427.cs @@ -93,17 +93,17 @@ namespace BrewMonster ~Skill427Stub() { } - public float GetMpcost(Skill skill) => 20f; - public int GetExecutetime(Skill skill) => 0; - public int GetCoolingtime(Skill skill) => 10000; + public override float GetMpcost(Skill skill) => 20f; + public override int GetExecutetime(Skill skill) => 0; + public override int GetCoolingtime(Skill skill) => 10000; public float GetRadius(Skill skill) => 0f; public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => 0f; - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => 0f; + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_SERVER public int GetEnmity(Skill skill) => 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill428.cs b/Assets/PerfectWorld/Scripts/Skills/skill428.cs index b4efc045a0..b56faddf10 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill428.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill428.cs @@ -93,17 +93,17 @@ namespace BrewMonster ~Skill428Stub() { } - public float GetMpcost(Skill skill) => 20f; - public int GetExecutetime(Skill skill) => 0; - public int GetCoolingtime(Skill skill) => 10000; + public override float GetMpcost(Skill skill) => 20f; + public override int GetExecutetime(Skill skill) => 0; + public override int GetCoolingtime(Skill skill) => 10000; public float GetRadius(Skill skill) => 0f; public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => 0f; - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => 0f; + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_SERVER public int GetEnmity(Skill skill) => 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill429.cs b/Assets/PerfectWorld/Scripts/Skills/skill429.cs index daf5dde250..28f7491cb1 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill429.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill429.cs @@ -93,17 +93,17 @@ namespace BrewMonster ~Skill429Stub() { } - public float GetMpcost(Skill skill) => 20f; - public int GetExecutetime(Skill skill) => 0; - public int GetCoolingtime(Skill skill) => 10000; + public override float GetMpcost(Skill skill) => 20f; + public override int GetExecutetime(Skill skill) => 0; + public override int GetCoolingtime(Skill skill) => 10000; public float GetRadius(Skill skill) => 0f; public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => 0f; - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => 0f; + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_SERVER public int GetEnmity(Skill skill) => 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill430.cs b/Assets/PerfectWorld/Scripts/Skills/skill430.cs index 2fffc4156c..412a9ca995 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill430.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill430.cs @@ -93,17 +93,17 @@ namespace BrewMonster ~Skill430Stub() { } - public float GetMpcost(Skill skill) => 375f; - public int GetExecutetime(Skill skill) => 0; - public int GetCoolingtime(Skill skill) => 30000; + public override float GetMpcost(Skill skill) => 375f; + public override int GetExecutetime(Skill skill) => 0; + public override int GetCoolingtime(Skill skill) => 30000; public float GetRadius(Skill skill) => 0f; public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => 0f; - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => 0f; + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) diff --git a/Assets/PerfectWorld/Scripts/Skills/skill431.cs b/Assets/PerfectWorld/Scripts/Skills/skill431.cs index e99e301e24..65d4f24362 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill431.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill431.cs @@ -93,17 +93,17 @@ namespace BrewMonster ~Skill431Stub() { } - public float GetMpcost(Skill skill) => 375f; - public int GetExecutetime(Skill skill) => 0; - public int GetCoolingtime(Skill skill) => 30000; + public override float GetMpcost(Skill skill) => 375f; + public override int GetExecutetime(Skill skill) => 0; + public override int GetCoolingtime(Skill skill) => 30000; public float GetRadius(Skill skill) => 0f; public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => 0f; - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => 0f; + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) diff --git a/Assets/PerfectWorld/Scripts/Skills/skill432.cs b/Assets/PerfectWorld/Scripts/Skills/skill432.cs index 520368386b..98971e856d 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill432.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill432.cs @@ -68,17 +68,17 @@ namespace BrewMonster ~Skill432Stub() { } - public float GetMpcost(Skill skill) => 0f; - public int GetExecutetime(Skill skill) => 0; - public int GetCoolingtime(Skill skill) => 0; + public override float GetMpcost(Skill skill) => 0f; + public override int GetExecutetime(Skill skill) => 0; + public override int GetCoolingtime(Skill skill) => 0; public float GetRadius(Skill skill) => 0f; public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => 0f; - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => 0f; + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) diff --git a/Assets/PerfectWorld/Scripts/Skills/skill433.cs b/Assets/PerfectWorld/Scripts/Skills/skill433.cs index 9264ce84af..003aa93efb 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill433.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill433.cs @@ -68,17 +68,17 @@ namespace BrewMonster ~Skill433Stub() { } - public float GetMpcost(Skill skill) => 0f; - public int GetExecutetime(Skill skill) => 0; - public int GetCoolingtime(Skill skill) => 0; + public override float GetMpcost(Skill skill) => 0f; + public override int GetExecutetime(Skill skill) => 0; + public override int GetCoolingtime(Skill skill) => 0; public float GetRadius(Skill skill) => 0f; public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => 0f; - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => 0f; + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) diff --git a/Assets/PerfectWorld/Scripts/Skills/skill434.cs b/Assets/PerfectWorld/Scripts/Skills/skill434.cs index d36c7881d1..1ab5d387b3 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill434.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill434.cs @@ -68,17 +68,17 @@ namespace BrewMonster ~Skill434Stub() { } - public float GetMpcost(Skill skill) => 0f; - public int GetExecutetime(Skill skill) => 0; - public int GetCoolingtime(Skill skill) => 0; + public override float GetMpcost(Skill skill) => 0f; + public override int GetExecutetime(Skill skill) => 0; + public override int GetCoolingtime(Skill skill) => 0; public float GetRadius(Skill skill) => 0f; public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => 0f; - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => 0f; + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) diff --git a/Assets/PerfectWorld/Scripts/Skills/skill435.cs b/Assets/PerfectWorld/Scripts/Skills/skill435.cs index fcf157a76b..7de551ec65 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill435.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill435.cs @@ -68,17 +68,17 @@ namespace BrewMonster ~Skill435Stub() { } - public float GetMpcost(Skill skill) => 0f; - public int GetExecutetime(Skill skill) => 0; - public int GetCoolingtime(Skill skill) => 0; + public override float GetMpcost(Skill skill) => 0f; + public override int GetExecutetime(Skill skill) => 0; + public override int GetCoolingtime(Skill skill) => 0; public float GetRadius(Skill skill) => 0f; public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => 0f; - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => 0f; + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) diff --git a/Assets/PerfectWorld/Scripts/Skills/skill436.cs b/Assets/PerfectWorld/Scripts/Skills/skill436.cs index 1cdf60b3a4..dbe07b67c9 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill436.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill436.cs @@ -68,17 +68,17 @@ namespace BrewMonster ~Skill436Stub() { } - public float GetMpcost(Skill skill) => 0f; - public int GetExecutetime(Skill skill) => 0; - public int GetCoolingtime(Skill skill) => 0; + public override float GetMpcost(Skill skill) => 0f; + public override int GetExecutetime(Skill skill) => 0; + public override int GetCoolingtime(Skill skill) => 0; public float GetRadius(Skill skill) => 0f; public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => 0f; - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => 0f; + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) diff --git a/Assets/PerfectWorld/Scripts/Skills/skill437.cs b/Assets/PerfectWorld/Scripts/Skills/skill437.cs index 5f1345c65a..fc71eeee8c 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill437.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill437.cs @@ -68,17 +68,17 @@ namespace BrewMonster ~Skill437Stub() { } - public float GetMpcost(Skill skill) => 0f; - public int GetExecutetime(Skill skill) => 0; - public int GetCoolingtime(Skill skill) => 0; + public override float GetMpcost(Skill skill) => 0f; + public override int GetExecutetime(Skill skill) => 0; + public override int GetCoolingtime(Skill skill) => 0; public float GetRadius(Skill skill) => 0f; public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => 0f; - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => 0f; + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) diff --git a/Assets/PerfectWorld/Scripts/Skills/skill438.cs b/Assets/PerfectWorld/Scripts/Skills/skill438.cs index 2a8d1551f2..5b39f4f20e 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill438.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill438.cs @@ -68,17 +68,17 @@ namespace BrewMonster ~Skill438Stub() { } - public float GetMpcost(Skill skill) => 0f; - public int GetExecutetime(Skill skill) => 0; - public int GetCoolingtime(Skill skill) => 0; + public override float GetMpcost(Skill skill) => 0f; + public override int GetExecutetime(Skill skill) => 0; + public override int GetCoolingtime(Skill skill) => 0; public float GetRadius(Skill skill) => 0f; public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => 0f; - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => 0f; + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) diff --git a/Assets/PerfectWorld/Scripts/Skills/skill439.cs b/Assets/PerfectWorld/Scripts/Skills/skill439.cs index 3401aa07d8..6f6038ed73 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill439.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill439.cs @@ -68,17 +68,17 @@ namespace BrewMonster ~Skill439Stub() { } - public float GetMpcost(Skill skill) => 0f; - public int GetExecutetime(Skill skill) => 0; - public int GetCoolingtime(Skill skill) => 0; + public override float GetMpcost(Skill skill) => 0f; + public override int GetExecutetime(Skill skill) => 0; + public override int GetCoolingtime(Skill skill) => 0; public float GetRadius(Skill skill) => 0f; public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => 0f; - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => 0f; + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) diff --git a/Assets/PerfectWorld/Scripts/Skills/skill440.cs b/Assets/PerfectWorld/Scripts/Skills/skill440.cs index ffbfb8344e..d635b94063 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill440.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill440.cs @@ -128,17 +128,17 @@ namespace BrewMonster ~Skill440Stub() { } - public float GetMpcost(Skill skill) => 265f; - public int GetExecutetime(Skill skill) => 800; - public int GetCoolingtime(Skill skill) => 3000; + public override float GetMpcost(Skill skill) => 265f; + public override int GetExecutetime(Skill skill) => 800; + public override int GetCoolingtime(Skill skill) => 3000; public float GetRadius(Skill skill) => 0f; public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => 30f; - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => 30f; + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) diff --git a/Assets/PerfectWorld/Scripts/Skills/skill441.cs b/Assets/PerfectWorld/Scripts/Skills/skill441.cs index 99abe0aaae..baf95f8808 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill441.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill441.cs @@ -128,17 +128,17 @@ namespace BrewMonster ~Skill441Stub() { } - public float GetMpcost(Skill skill) => 265f; - public int GetExecutetime(Skill skill) => 800; - public int GetCoolingtime(Skill skill) => 3000; + public override float GetMpcost(Skill skill) => 265f; + public override int GetExecutetime(Skill skill) => 800; + public override int GetCoolingtime(Skill skill) => 3000; public float GetRadius(Skill skill) => 0f; public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => 30f; - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => 30f; + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) diff --git a/Assets/PerfectWorld/Scripts/Skills/skill442.cs b/Assets/PerfectWorld/Scripts/Skills/skill442.cs index 6e3e63c12f..faee174a4f 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill442.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill442.cs @@ -125,17 +125,17 @@ namespace BrewMonster ~Skill442Stub() { } - public float GetMpcost(Skill skill) => 265f; - public int GetExecutetime(Skill skill) => 1200; - public int GetCoolingtime(Skill skill) => 3000; + public override float GetMpcost(Skill skill) => 265f; + public override int GetExecutetime(Skill skill) => 1200; + public override int GetCoolingtime(Skill skill) => 3000; public float GetRadius(Skill skill) => 0f; public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => 0f; - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => 0f; + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) diff --git a/Assets/PerfectWorld/Scripts/Skills/skill443.cs b/Assets/PerfectWorld/Scripts/Skills/skill443.cs index 3a0ab12257..fdfca10008 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill443.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill443.cs @@ -125,17 +125,17 @@ namespace BrewMonster ~Skill443Stub() { } - public float GetMpcost(Skill skill) => 265f; - public int GetExecutetime(Skill skill) => 1200; - public int GetCoolingtime(Skill skill) => 3000; + public override float GetMpcost(Skill skill) => 265f; + public override int GetExecutetime(Skill skill) => 1200; + public override int GetCoolingtime(Skill skill) => 3000; public float GetRadius(Skill skill) => 0f; public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => 0f; - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => 0f; + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) diff --git a/Assets/PerfectWorld/Scripts/Skills/skill444.cs b/Assets/PerfectWorld/Scripts/Skills/skill444.cs index c86e51da33..49037c2e3a 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill444.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill444.cs @@ -129,17 +129,17 @@ namespace BrewMonster ~Skill444Stub() { } - public float GetMpcost(Skill skill) => 265f; - public int GetExecutetime(Skill skill) => 1000; - public int GetCoolingtime(Skill skill) => 8000; + public override float GetMpcost(Skill skill) => 265f; + public override int GetExecutetime(Skill skill) => 1000; + public override int GetCoolingtime(Skill skill) => 8000; public float GetRadius(Skill skill) => 0f; public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => 30f; - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => 30f; + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) diff --git a/Assets/PerfectWorld/Scripts/Skills/skill445.cs b/Assets/PerfectWorld/Scripts/Skills/skill445.cs index cecdf26ece..4bdf56b2c2 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill445.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill445.cs @@ -129,17 +129,17 @@ namespace BrewMonster ~Skill445Stub() { } - public float GetMpcost(Skill skill) => 265f; - public int GetExecutetime(Skill skill) => 1000; - public int GetCoolingtime(Skill skill) => 8000; + public override float GetMpcost(Skill skill) => 265f; + public override int GetExecutetime(Skill skill) => 1000; + public override int GetCoolingtime(Skill skill) => 8000; public float GetRadius(Skill skill) => 0f; public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => 30f; - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => 30f; + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) diff --git a/Assets/PerfectWorld/Scripts/Skills/skill446.cs b/Assets/PerfectWorld/Scripts/Skills/skill446.cs index dddb4ad7d9..ef61dc30be 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill446.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill446.cs @@ -128,17 +128,17 @@ namespace BrewMonster ~Skill446Stub() { } - public float GetMpcost(Skill skill) => 450f; - public int GetExecutetime(Skill skill) => 1000; - public int GetCoolingtime(Skill skill) => 3000; + public override float GetMpcost(Skill skill) => 450f; + public override int GetExecutetime(Skill skill) => 1000; + public override int GetCoolingtime(Skill skill) => 3000; public float GetRadius(Skill skill) => (float)(7 + 0.5 * skill.GetLevel()); public float GetAttackdistance(Skill skill) => (float)(4 + 0.3 * skill.GetLevel()); public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => 30f; - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => 30f; + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) diff --git a/Assets/PerfectWorld/Scripts/Skills/skill447.cs b/Assets/PerfectWorld/Scripts/Skills/skill447.cs index cf0855f52b..bd4bc877ae 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill447.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill447.cs @@ -128,17 +128,17 @@ namespace BrewMonster ~Skill447Stub() { } - public float GetMpcost(Skill skill) => 450f; - public int GetExecutetime(Skill skill) => 1000; - public int GetCoolingtime(Skill skill) => 3000; + public override float GetMpcost(Skill skill) => 450f; + public override int GetExecutetime(Skill skill) => 1000; + public override int GetCoolingtime(Skill skill) => 3000; public float GetRadius(Skill skill) => (float)(7 + 0.5 * skill.GetLevel()); public float GetAttackdistance(Skill skill) => (float)(4 + 0.3 * skill.GetLevel()); public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => 30f; - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => 30f; + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) diff --git a/Assets/PerfectWorld/Scripts/Skills/skill448.cs b/Assets/PerfectWorld/Scripts/Skills/skill448.cs index 9bccd76de3..d1e9e07767 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill448.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill448.cs @@ -146,17 +146,17 @@ namespace BrewMonster ~Skill448Stub() { } - public float GetMpcost(Skill skill) => 350f; - public int GetExecutetime(Skill skill) => -1; - public int GetCoolingtime(Skill skill) => 15000; + public override float GetMpcost(Skill skill) => 350f; + public override int GetExecutetime(Skill skill) => -1; + public override int GetCoolingtime(Skill skill) => 15000; public float GetRadius(Skill skill) => 12f; public float GetAttackdistance(Skill skill) => (float)(4 + 0.3 * skill.GetLevel()); public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => 6f; - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => 6f; + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) diff --git a/Assets/PerfectWorld/Scripts/Skills/skill449.cs b/Assets/PerfectWorld/Scripts/Skills/skill449.cs index 5705210790..2b324aa871 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill449.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill449.cs @@ -146,17 +146,17 @@ namespace BrewMonster ~Skill449Stub() { } - public float GetMpcost(Skill skill) => 350f; - public int GetExecutetime(Skill skill) => -1; - public int GetCoolingtime(Skill skill) => 15000; + public override float GetMpcost(Skill skill) => 350f; + public override int GetExecutetime(Skill skill) => -1; + public override int GetCoolingtime(Skill skill) => 15000; public float GetRadius(Skill skill) => 12f; public float GetAttackdistance(Skill skill) => (float)(4 + 0.3 * skill.GetLevel()); public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => 6f; - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => 6f; + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) diff --git a/Assets/PerfectWorld/Scripts/Skills/skill450.cs b/Assets/PerfectWorld/Scripts/Skills/skill450.cs index e981508d97..4b6e589c11 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill450.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill450.cs @@ -128,17 +128,17 @@ namespace BrewMonster ~Skill450Stub() { } - public float GetMpcost(Skill skill) => 445f; - public int GetExecutetime(Skill skill) => 1000; - public int GetCoolingtime(Skill skill) => 7000; + public override float GetMpcost(Skill skill) => 445f; + public override int GetExecutetime(Skill skill) => 1000; + public override int GetCoolingtime(Skill skill) => 7000; public float GetRadius(Skill skill) => 5f; public float GetAttackdistance(Skill skill) => 18f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => 10f; - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => 10f; + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) diff --git a/Assets/PerfectWorld/Scripts/Skills/skill451.cs b/Assets/PerfectWorld/Scripts/Skills/skill451.cs index 1aefef0d73..c0fd134015 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill451.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill451.cs @@ -128,17 +128,17 @@ namespace BrewMonster ~Skill451Stub() { } - public float GetMpcost(Skill skill) => 445f; - public int GetExecutetime(Skill skill) => 1000; - public int GetCoolingtime(Skill skill) => 8000; + public override float GetMpcost(Skill skill) => 445f; + public override int GetExecutetime(Skill skill) => 1000; + public override int GetCoolingtime(Skill skill) => 8000; public float GetRadius(Skill skill) => 8f; public float GetAttackdistance(Skill skill) => 18f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => 10f; - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => 10f; + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) diff --git a/Assets/PerfectWorld/Scripts/Skills/skill452.cs b/Assets/PerfectWorld/Scripts/Skills/skill452.cs index 54ce8f1601..4f89ad0993 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill452.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill452.cs @@ -129,17 +129,17 @@ namespace BrewMonster ~Skill452Stub() { } - public float GetMpcost(Skill skill) => 295f; - public int GetExecutetime(Skill skill) => 1000; - public int GetCoolingtime(Skill skill) => 15000; + public override float GetMpcost(Skill skill) => 295f; + public override int GetExecutetime(Skill skill) => 1000; + public override int GetCoolingtime(Skill skill) => 15000; public float GetRadius(Skill skill) => 12f; public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => 6f; - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => 6f; + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) diff --git a/Assets/PerfectWorld/Scripts/Skills/skill453.cs b/Assets/PerfectWorld/Scripts/Skills/skill453.cs index 39d6e54d96..c1e3c9c9f7 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill453.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill453.cs @@ -129,17 +129,17 @@ namespace BrewMonster ~Skill453Stub() { } - public float GetMpcost(Skill skill) => 295f; - public int GetExecutetime(Skill skill) => 1000; - public int GetCoolingtime(Skill skill) => 15000; + public override float GetMpcost(Skill skill) => 295f; + public override int GetExecutetime(Skill skill) => 1000; + public override int GetCoolingtime(Skill skill) => 15000; public float GetRadius(Skill skill) => 12f; public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => 6f; - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => 6f; + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) diff --git a/Assets/PerfectWorld/Scripts/Skills/skill454.cs b/Assets/PerfectWorld/Scripts/Skills/skill454.cs index b40aa4d30f..65789bd297 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill454.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill454.cs @@ -131,17 +131,17 @@ namespace BrewMonster ~Skill454Stub() { } - public float GetMpcost(Skill skill) => 655f; - public int GetExecutetime(Skill skill) => 1800; - public int GetCoolingtime(Skill skill) => 30000; + public override float GetMpcost(Skill skill) => 655f; + public override int GetExecutetime(Skill skill) => 1800; + public override int GetCoolingtime(Skill skill) => 30000; public float GetRadius(Skill skill) => 12f; public float GetAttackdistance(Skill skill) => (float)(4 + 0.3 * skill.GetLevel()); public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => 30f; - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => 30f; + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) diff --git a/Assets/PerfectWorld/Scripts/Skills/skill455.cs b/Assets/PerfectWorld/Scripts/Skills/skill455.cs index 054e8939ea..70148f9edd 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill455.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill455.cs @@ -131,17 +131,17 @@ namespace BrewMonster ~Skill455Stub() { } - public float GetMpcost(Skill skill) => 655f; - public int GetExecutetime(Skill skill) => 1800; - public int GetCoolingtime(Skill skill) => 30000; + public override float GetMpcost(Skill skill) => 655f; + public override int GetExecutetime(Skill skill) => 1800; + public override int GetCoolingtime(Skill skill) => 30000; public float GetRadius(Skill skill) => 12f; public float GetAttackdistance(Skill skill) => (float)(4 + 0.3 * skill.GetLevel()); public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => 30f; - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => 30f; + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) diff --git a/Assets/PerfectWorld/Scripts/Skills/skill456.cs b/Assets/PerfectWorld/Scripts/Skills/skill456.cs index fd48e07454..ecb5f226b0 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill456.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill456.cs @@ -128,17 +128,17 @@ namespace BrewMonster ~Skill456Stub() { } - public float GetMpcost(Skill skill) => 265f; - public int GetExecutetime(Skill skill) => 1000; - public int GetCoolingtime(Skill skill) => 3000; + public override float GetMpcost(Skill skill) => 265f; + public override int GetExecutetime(Skill skill) => 1000; + public override int GetCoolingtime(Skill skill) => 3000; public float GetRadius(Skill skill) => 0f; public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => 30f; - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => 30f; + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) diff --git a/Assets/PerfectWorld/Scripts/Skills/skill457.cs b/Assets/PerfectWorld/Scripts/Skills/skill457.cs index d66b14c512..466ca28d0d 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill457.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill457.cs @@ -128,17 +128,17 @@ namespace BrewMonster ~Skill457Stub() { } - public float GetMpcost(Skill skill) => 265f; - public int GetExecutetime(Skill skill) => 1000; - public int GetCoolingtime(Skill skill) => 3000; + public override float GetMpcost(Skill skill) => 265f; + public override int GetExecutetime(Skill skill) => 1000; + public override int GetCoolingtime(Skill skill) => 3000; public float GetRadius(Skill skill) => 0f; public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => 30f; - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => 30f; + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) diff --git a/Assets/PerfectWorld/Scripts/Skills/skill458.cs b/Assets/PerfectWorld/Scripts/Skills/skill458.cs index 4852dcd706..8bcc99d23b 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill458.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill458.cs @@ -125,17 +125,17 @@ namespace BrewMonster ~Skill458Stub() { } - public float GetMpcost(Skill skill) => 265f; - public int GetExecutetime(Skill skill) => 1200; - public int GetCoolingtime(Skill skill) => 3000; + public override float GetMpcost(Skill skill) => 265f; + public override int GetExecutetime(Skill skill) => 1200; + public override int GetCoolingtime(Skill skill) => 3000; public float GetRadius(Skill skill) => 0f; public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => 0f; - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => 0f; + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) diff --git a/Assets/PerfectWorld/Scripts/Skills/skill459.cs b/Assets/PerfectWorld/Scripts/Skills/skill459.cs index e96d514fa6..e0fbf395e3 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill459.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill459.cs @@ -125,17 +125,17 @@ namespace BrewMonster ~Skill459Stub() { } - public float GetMpcost(Skill skill) => 265f; - public int GetExecutetime(Skill skill) => 1200; - public int GetCoolingtime(Skill skill) => 3000; + public override float GetMpcost(Skill skill) => 265f; + public override int GetExecutetime(Skill skill) => 1200; + public override int GetCoolingtime(Skill skill) => 3000; public float GetRadius(Skill skill) => 0f; public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => 0f; - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => 0f; + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) diff --git a/Assets/PerfectWorld/Scripts/Skills/skill460.cs b/Assets/PerfectWorld/Scripts/Skills/skill460.cs index 80023d1708..d666778f24 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill460.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill460.cs @@ -129,17 +129,17 @@ namespace BrewMonster ~Skill460Stub() { } - public float GetMpcost(Skill skill) => 320f; - public int GetExecutetime(Skill skill) => 1200; - public int GetCoolingtime(Skill skill) => 12000; + public override float GetMpcost(Skill skill) => 320f; + public override int GetExecutetime(Skill skill) => 1200; + public override int GetCoolingtime(Skill skill) => 12000; public float GetRadius(Skill skill) => 8f; public float GetAttackdistance(Skill skill) => (float)(4 + 0.4 * skill.GetLevel()); public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => 30f; - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => 30f; + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) diff --git a/Assets/PerfectWorld/Scripts/Skills/skill461.cs b/Assets/PerfectWorld/Scripts/Skills/skill461.cs index 0aac9dcdc5..cb077f3592 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill461.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill461.cs @@ -129,17 +129,17 @@ namespace BrewMonster ~Skill461Stub() { } - public float GetMpcost(Skill skill) => 320f; - public int GetExecutetime(Skill skill) => 1200; - public int GetCoolingtime(Skill skill) => 12000; + public override float GetMpcost(Skill skill) => 320f; + public override int GetExecutetime(Skill skill) => 1200; + public override int GetCoolingtime(Skill skill) => 12000; public float GetRadius(Skill skill) => 8f; public float GetAttackdistance(Skill skill) => (float)(4 + 0.4 * skill.GetLevel()); public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => 30f; - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => 30f; + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) diff --git a/Assets/PerfectWorld/Scripts/Skills/skill462.cs b/Assets/PerfectWorld/Scripts/Skills/skill462.cs index 53c97e04c7..aa477b6d69 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill462.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill462.cs @@ -125,17 +125,17 @@ namespace BrewMonster ~Skill462Stub() { } - public float GetMpcost(Skill skill) => 595f; - public int GetExecutetime(Skill skill) => 1200; - public int GetCoolingtime(Skill skill) => 1000; + public override float GetMpcost(Skill skill) => 595f; + public override int GetExecutetime(Skill skill) => 1200; + public override int GetCoolingtime(Skill skill) => 1000; public float GetRadius(Skill skill) => 0f; public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => 30f; - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => 30f; + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) diff --git a/Assets/PerfectWorld/Scripts/Skills/skill463.cs b/Assets/PerfectWorld/Scripts/Skills/skill463.cs index dbb98d7246..76324db4c6 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill463.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill463.cs @@ -125,17 +125,17 @@ namespace BrewMonster ~Skill463Stub() { } - public float GetMpcost(Skill skill) => 595f; - public int GetExecutetime(Skill skill) => 1200; - public int GetCoolingtime(Skill skill) => 1000; + public override float GetMpcost(Skill skill) => 595f; + public override int GetExecutetime(Skill skill) => 1200; + public override int GetCoolingtime(Skill skill) => 1000; public float GetRadius(Skill skill) => 0f; public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => 30f; - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => 30f; + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) diff --git a/Assets/PerfectWorld/Scripts/Skills/skill464.cs b/Assets/PerfectWorld/Scripts/Skills/skill464.cs index e5f0cd1968..5e9b3149dd 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill464.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill464.cs @@ -89,17 +89,17 @@ namespace BrewMonster ~Skill464Stub() { } - public float GetMpcost(Skill skill) => 300f; - public int GetExecutetime(Skill skill) => 0; - public int GetCoolingtime(Skill skill) => 3000; + public override float GetMpcost(Skill skill) => 300f; + public override int GetExecutetime(Skill skill) => 0; + public override int GetCoolingtime(Skill skill) => 3000; public float GetRadius(Skill skill) => 0f; public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => 0f; - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => 0f; + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) diff --git a/Assets/PerfectWorld/Scripts/Skills/skill465.cs b/Assets/PerfectWorld/Scripts/Skills/skill465.cs index 069f7c5423..2733f55e14 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill465.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill465.cs @@ -89,17 +89,17 @@ namespace BrewMonster ~Skill465Stub() { } - public float GetMpcost(Skill skill) => 300f; - public int GetExecutetime(Skill skill) => 0; - public int GetCoolingtime(Skill skill) => 3000; + public override float GetMpcost(Skill skill) => 300f; + public override int GetExecutetime(Skill skill) => 0; + public override int GetCoolingtime(Skill skill) => 3000; public float GetRadius(Skill skill) => 0f; public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => 0f; - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => 0f; + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) diff --git a/Assets/PerfectWorld/Scripts/Skills/skill466.cs b/Assets/PerfectWorld/Scripts/Skills/skill466.cs index b27bc785ee..6c1e860e67 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill466.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill466.cs @@ -125,17 +125,17 @@ namespace BrewMonster ~Skill466Stub() { } - public float GetMpcost(Skill skill) => 600f; - public int GetExecutetime(Skill skill) => 1000; - public int GetCoolingtime(Skill skill) => 3000; + public override float GetMpcost(Skill skill) => 600f; + public override int GetExecutetime(Skill skill) => 1000; + public override int GetCoolingtime(Skill skill) => 3000; public float GetRadius(Skill skill) => 0f; public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => 30f; - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => 30f; + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) diff --git a/Assets/PerfectWorld/Scripts/Skills/skill467.cs b/Assets/PerfectWorld/Scripts/Skills/skill467.cs index 1b8b4abbd4..c768d423b5 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill467.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill467.cs @@ -125,17 +125,17 @@ namespace BrewMonster ~Skill467Stub() { } - public float GetMpcost(Skill skill) => 600f; - public int GetExecutetime(Skill skill) => 1000; - public int GetCoolingtime(Skill skill) => 3000; + public override float GetMpcost(Skill skill) => 600f; + public override int GetExecutetime(Skill skill) => 1000; + public override int GetCoolingtime(Skill skill) => 3000; public float GetRadius(Skill skill) => 0f; public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => 30f; - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => 30f; + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) diff --git a/Assets/PerfectWorld/Scripts/Skills/skill468.cs b/Assets/PerfectWorld/Scripts/Skills/skill468.cs index 3979caa70c..348c48f9c0 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill468.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill468.cs @@ -128,17 +128,17 @@ namespace BrewMonster ~Skill468Stub() { } - public float GetMpcost(Skill skill) => 445f; - public int GetExecutetime(Skill skill) => 1800; - public int GetCoolingtime(Skill skill) => 15000; + public override float GetMpcost(Skill skill) => 445f; + public override int GetExecutetime(Skill skill) => 1800; + public override int GetCoolingtime(Skill skill) => 15000; public float GetRadius(Skill skill) => 0f; public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => 30f; - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => 30f; + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) diff --git a/Assets/PerfectWorld/Scripts/Skills/skill469.cs b/Assets/PerfectWorld/Scripts/Skills/skill469.cs index a77062596b..eec1d00f57 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill469.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill469.cs @@ -128,17 +128,17 @@ namespace BrewMonster ~Skill469Stub() { } - public float GetMpcost(Skill skill) => 445f; - public int GetExecutetime(Skill skill) => 1800; - public int GetCoolingtime(Skill skill) => 15000; + public override float GetMpcost(Skill skill) => 445f; + public override int GetExecutetime(Skill skill) => 1800; + public override int GetCoolingtime(Skill skill) => 15000; public float GetRadius(Skill skill) => 0f; public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => 30f; - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => 30f; + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) diff --git a/Assets/PerfectWorld/Scripts/Skills/skill470.cs b/Assets/PerfectWorld/Scripts/Skills/skill470.cs index d7ee527393..81e15bbce8 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill470.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill470.cs @@ -128,17 +128,17 @@ namespace BrewMonster ~Skill470Stub() { } - public float GetMpcost(Skill skill) => 655f; - public int GetExecutetime(Skill skill) => 1600; - public int GetCoolingtime(Skill skill) => 30000; + public override float GetMpcost(Skill skill) => 655f; + public override int GetExecutetime(Skill skill) => 1600; + public override int GetCoolingtime(Skill skill) => 30000; public float GetRadius(Skill skill) => 12f; public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => 30f; - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => 30f; + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) diff --git a/Assets/PerfectWorld/Scripts/Skills/skill471.cs b/Assets/PerfectWorld/Scripts/Skills/skill471.cs index aa507ba800..91fa93a5e5 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill471.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill471.cs @@ -128,17 +128,17 @@ namespace BrewMonster ~Skill471Stub() { } - public float GetMpcost(Skill skill) => 655f; - public int GetExecutetime(Skill skill) => 1600; - public int GetCoolingtime(Skill skill) => 30000; + public override float GetMpcost(Skill skill) => 655f; + public override int GetExecutetime(Skill skill) => 1600; + public override int GetCoolingtime(Skill skill) => 30000; public float GetRadius(Skill skill) => 12f; public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => 30f; - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => 30f; + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) diff --git a/Assets/PerfectWorld/Scripts/Skills/skill472.cs b/Assets/PerfectWorld/Scripts/Skills/skill472.cs index 462c0f9495..62a746ba90 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill472.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill472.cs @@ -128,17 +128,17 @@ namespace BrewMonster ~Skill472Stub() { } - public float GetMpcost(Skill skill) => 375f; - public int GetExecutetime(Skill skill) => 1400; - public int GetCoolingtime(Skill skill) => 3000; + public override float GetMpcost(Skill skill) => 375f; + public override int GetExecutetime(Skill skill) => 1400; + public override int GetCoolingtime(Skill skill) => 3000; public float GetRadius(Skill skill) => 0f; public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => 30f; - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => 30f; + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) diff --git a/Assets/PerfectWorld/Scripts/Skills/skill473.cs b/Assets/PerfectWorld/Scripts/Skills/skill473.cs index 8fac0b879a..1364177daa 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill473.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill473.cs @@ -128,17 +128,17 @@ namespace BrewMonster ~Skill473Stub() { } - public float GetMpcost(Skill skill) => 375f; - public int GetExecutetime(Skill skill) => 1400; - public int GetCoolingtime(Skill skill) => 3000; + public override float GetMpcost(Skill skill) => 375f; + public override int GetExecutetime(Skill skill) => 1400; + public override int GetCoolingtime(Skill skill) => 3000; public float GetRadius(Skill skill) => 0f; public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => 30f; - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => 30f; + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) diff --git a/Assets/PerfectWorld/Scripts/Skills/skill474.cs b/Assets/PerfectWorld/Scripts/Skills/skill474.cs index b1ed9dc2cd..14c4b0fb46 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill474.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill474.cs @@ -125,17 +125,17 @@ namespace BrewMonster ~Skill474Stub() { } - public float GetMpcost(Skill skill) => 265f; - public int GetExecutetime(Skill skill) => 1200; - public int GetCoolingtime(Skill skill) => 3000; + public override float GetMpcost(Skill skill) => 265f; + public override int GetExecutetime(Skill skill) => 1200; + public override int GetCoolingtime(Skill skill) => 3000; public float GetRadius(Skill skill) => 0f; public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => 0f; - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => 0f; + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) diff --git a/Assets/PerfectWorld/Scripts/Skills/skill475.cs b/Assets/PerfectWorld/Scripts/Skills/skill475.cs index 961ed77434..a64a1d29fe 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill475.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill475.cs @@ -125,17 +125,17 @@ namespace BrewMonster ~Skill475Stub() { } - public float GetMpcost(Skill skill) => 265f; - public int GetExecutetime(Skill skill) => 1200; - public int GetCoolingtime(Skill skill) => 3000; + public override float GetMpcost(Skill skill) => 265f; + public override int GetExecutetime(Skill skill) => 1200; + public override int GetCoolingtime(Skill skill) => 3000; public float GetRadius(Skill skill) => 0f; public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => 0f; - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => 0f; + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) diff --git a/Assets/PerfectWorld/Scripts/Skills/skill476.cs b/Assets/PerfectWorld/Scripts/Skills/skill476.cs index 9c5a4e9277..62ef9ea53b 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill476.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill476.cs @@ -128,17 +128,17 @@ namespace BrewMonster ~Skill476Stub() { } - public float GetMpcost(Skill skill) => 320f; - public int GetExecutetime(Skill skill) => 1000; - public int GetCoolingtime(Skill skill) => 8000; + public override float GetMpcost(Skill skill) => 320f; + public override int GetExecutetime(Skill skill) => 1000; + public override int GetCoolingtime(Skill skill) => 8000; public float GetRadius(Skill skill) => 0f; public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => 30f; - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => 30f; + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) diff --git a/Assets/PerfectWorld/Scripts/Skills/skill477.cs b/Assets/PerfectWorld/Scripts/Skills/skill477.cs index e2edcddb92..7634a3257b 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill477.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill477.cs @@ -128,17 +128,17 @@ namespace BrewMonster ~Skill477Stub() { } - public float GetMpcost(Skill skill) => 320f; - public int GetExecutetime(Skill skill) => 1000; - public int GetCoolingtime(Skill skill) => 8000; + public override float GetMpcost(Skill skill) => 320f; + public override int GetExecutetime(Skill skill) => 1000; + public override int GetCoolingtime(Skill skill) => 8000; public float GetRadius(Skill skill) => 0f; public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => 30f; - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => 30f; + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) diff --git a/Assets/PerfectWorld/Scripts/Skills/skill478.cs b/Assets/PerfectWorld/Scripts/Skills/skill478.cs index dad165e9d1..0ac0a64f5c 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill478.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill478.cs @@ -125,17 +125,17 @@ namespace BrewMonster ~Skill478Stub() { } - public float GetMpcost(Skill skill) => 60f; - public int GetExecutetime(Skill skill) => 1000; - public int GetCoolingtime(Skill skill) => 10000; + public override float GetMpcost(Skill skill) => 60f; + public override int GetExecutetime(Skill skill) => 1000; + public override int GetCoolingtime(Skill skill) => 10000; public float GetRadius(Skill skill) => (float)(2 + 0.3 * skill.GetLevel()); public float GetAttackdistance(Skill skill) => (float)(4 + 0.4 * skill.GetLevel()); public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => 25f; - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => 25f; + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) diff --git a/Assets/PerfectWorld/Scripts/Skills/skill479.cs b/Assets/PerfectWorld/Scripts/Skills/skill479.cs index 5fc44af247..e8f8a0a57e 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill479.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill479.cs @@ -125,17 +125,17 @@ namespace BrewMonster ~Skill479Stub() { } - public float GetMpcost(Skill skill) => 60f; - public int GetExecutetime(Skill skill) => 1000; - public int GetCoolingtime(Skill skill) => 10000; + public override float GetMpcost(Skill skill) => 60f; + public override int GetExecutetime(Skill skill) => 1000; + public override int GetCoolingtime(Skill skill) => 10000; public float GetRadius(Skill skill) => (float)(2 + 0.3 * skill.GetLevel()); public float GetAttackdistance(Skill skill) => (float)(4 + 0.4 * skill.GetLevel()); public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => 30f; - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => 30f; + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) diff --git a/Assets/PerfectWorld/Scripts/Skills/skill480.cs b/Assets/PerfectWorld/Scripts/Skills/skill480.cs index e7f0b8a081..c1d4133340 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill480.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill480.cs @@ -128,17 +128,17 @@ namespace BrewMonster ~Skill480Stub() { } - public float GetMpcost(Skill skill) => 445f; - public int GetExecutetime(Skill skill) => 1500; - public int GetCoolingtime(Skill skill) => 5000; + public override float GetMpcost(Skill skill) => 445f; + public override int GetExecutetime(Skill skill) => 1500; + public override int GetCoolingtime(Skill skill) => 5000; public float GetRadius(Skill skill) => 0f; public float GetAttackdistance(Skill skill) => (float)(15 + 0.4 * skill.GetLevel()); public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => 30f; - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => 30f; + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) diff --git a/Assets/PerfectWorld/Scripts/Skills/skill481.cs b/Assets/PerfectWorld/Scripts/Skills/skill481.cs index 4c0855e1bd..74a8af8dc3 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill481.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill481.cs @@ -128,17 +128,17 @@ namespace BrewMonster ~Skill481Stub() { } - public float GetMpcost(Skill skill) => 445f; - public int GetExecutetime(Skill skill) => 1500; - public int GetCoolingtime(Skill skill) => 5000; + public override float GetMpcost(Skill skill) => 445f; + public override int GetExecutetime(Skill skill) => 1500; + public override int GetCoolingtime(Skill skill) => 5000; public float GetRadius(Skill skill) => 0f; public float GetAttackdistance(Skill skill) => (float)(15 + 0.4 * skill.GetLevel()); public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => 30f; - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => 30f; + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) diff --git a/Assets/PerfectWorld/Scripts/Skills/skill482.cs b/Assets/PerfectWorld/Scripts/Skills/skill482.cs index cccf5ea347..a3f9a2d08e 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill482.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill482.cs @@ -125,17 +125,17 @@ namespace BrewMonster ~Skill482Stub() { } - public float GetMpcost(Skill skill) => 295f; - public int GetExecutetime(Skill skill) => 2000; - public int GetCoolingtime(Skill skill) => 20000; + public override float GetMpcost(Skill skill) => 295f; + public override int GetExecutetime(Skill skill) => 2000; + public override int GetCoolingtime(Skill skill) => 20000; public float GetRadius(Skill skill) => 3f; public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => 30f; - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => 30f; + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) diff --git a/Assets/PerfectWorld/Scripts/Skills/skill483.cs b/Assets/PerfectWorld/Scripts/Skills/skill483.cs index c1b97430cb..aa1981dfa0 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill483.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill483.cs @@ -125,17 +125,17 @@ namespace BrewMonster ~Skill483Stub() { } - public float GetMpcost(Skill skill) => 295f; - public int GetExecutetime(Skill skill) => 2000; - public int GetCoolingtime(Skill skill) => 18000; + public override float GetMpcost(Skill skill) => 295f; + public override int GetExecutetime(Skill skill) => 2000; + public override int GetCoolingtime(Skill skill) => 18000; public float GetRadius(Skill skill) => 0f; public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => 30f; - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => 30f; + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) diff --git a/Assets/PerfectWorld/Scripts/Skills/skill484.cs b/Assets/PerfectWorld/Scripts/Skills/skill484.cs index 32c3dc61e5..be32f5f12a 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill484.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill484.cs @@ -128,17 +128,17 @@ namespace BrewMonster ~Skill484Stub() { } - public float GetMpcost(Skill skill) => 655f; - public int GetExecutetime(Skill skill) => 1400; - public int GetCoolingtime(Skill skill) => 30000; + public override float GetMpcost(Skill skill) => 655f; + public override int GetExecutetime(Skill skill) => 1400; + public override int GetCoolingtime(Skill skill) => 30000; public float GetRadius(Skill skill) => 12f; public float GetAttackdistance(Skill skill) => (float)(4 + 0.4 * skill.GetLevel()); public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => 30f; - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => 30f; + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) diff --git a/Assets/PerfectWorld/Scripts/Skills/skill485.cs b/Assets/PerfectWorld/Scripts/Skills/skill485.cs index 433f3f7b6e..d148a42cb5 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill485.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill485.cs @@ -128,17 +128,17 @@ namespace BrewMonster ~Skill485Stub() { } - public float GetMpcost(Skill skill) => 655f; - public int GetExecutetime(Skill skill) => 1400; - public int GetCoolingtime(Skill skill) => 30000; + public override float GetMpcost(Skill skill) => 655f; + public override int GetExecutetime(Skill skill) => 1400; + public override int GetCoolingtime(Skill skill) => 30000; public float GetRadius(Skill skill) => 12f; public float GetAttackdistance(Skill skill) => (float)(4 + 0.4 * skill.GetLevel()); public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => 35f; - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => 35f; + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) diff --git a/Assets/PerfectWorld/Scripts/Skills/skill486.cs b/Assets/PerfectWorld/Scripts/Skills/skill486.cs index 20c76c00aa..1c794b1726 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill486.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill486.cs @@ -68,17 +68,17 @@ namespace BrewMonster ~Skill486Stub() { } - public float GetMpcost(Skill skill) => 0f; - public int GetExecutetime(Skill skill) => 0; - public int GetCoolingtime(Skill skill) => 0; + public override float GetMpcost(Skill skill) => 0f; + public override int GetExecutetime(Skill skill) => 0; + public override int GetCoolingtime(Skill skill) => 0; public float GetRadius(Skill skill) => 0f; public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => 0f; - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => 0f; + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) diff --git a/Assets/PerfectWorld/Scripts/Skills/skill487.cs b/Assets/PerfectWorld/Scripts/Skills/skill487.cs index a1b9edf412..ddf1e1e5ad 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill487.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill487.cs @@ -68,17 +68,17 @@ namespace BrewMonster ~Skill487Stub() { } - public float GetMpcost(Skill skill) => 0f; - public int GetExecutetime(Skill skill) => 0; - public int GetCoolingtime(Skill skill) => 0; + public override float GetMpcost(Skill skill) => 0f; + public override int GetExecutetime(Skill skill) => 0; + public override int GetCoolingtime(Skill skill) => 0; public float GetRadius(Skill skill) => 0f; public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => 0f; - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => 0f; + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) diff --git a/Assets/PerfectWorld/Scripts/Skills/skill488.cs b/Assets/PerfectWorld/Scripts/Skills/skill488.cs index f744a8739c..3c951ba512 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill488.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill488.cs @@ -68,17 +68,17 @@ namespace BrewMonster ~Skill488Stub() { } - public float GetMpcost(Skill skill) => 0f; - public int GetExecutetime(Skill skill) => 0; - public int GetCoolingtime(Skill skill) => 0; + public override float GetMpcost(Skill skill) => 0f; + public override int GetExecutetime(Skill skill) => 0; + public override int GetCoolingtime(Skill skill) => 0; public float GetRadius(Skill skill) => 0f; public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => 0f; - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => 0f; + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) diff --git a/Assets/PerfectWorld/Scripts/Skills/skill489.cs b/Assets/PerfectWorld/Scripts/Skills/skill489.cs index 8215aa2927..9a712f3171 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill489.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill489.cs @@ -68,17 +68,17 @@ namespace BrewMonster ~Skill489Stub() { } - public float GetMpcost(Skill skill) => 0f; - public int GetExecutetime(Skill skill) => 0; - public int GetCoolingtime(Skill skill) => 0; + public override float GetMpcost(Skill skill) => 0f; + public override int GetExecutetime(Skill skill) => 0; + public override int GetCoolingtime(Skill skill) => 0; public float GetRadius(Skill skill) => 0f; public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => 0f; - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => 0f; + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) diff --git a/Assets/PerfectWorld/Scripts/Skills/skill490.cs b/Assets/PerfectWorld/Scripts/Skills/skill490.cs index a3834d2da7..0c201ae473 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill490.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill490.cs @@ -68,17 +68,17 @@ namespace BrewMonster ~Skill490Stub() { } - public float GetMpcost(Skill skill) => 0f; - public int GetExecutetime(Skill skill) => 0; - public int GetCoolingtime(Skill skill) => 0; + public override float GetMpcost(Skill skill) => 0f; + public override int GetExecutetime(Skill skill) => 0; + public override int GetCoolingtime(Skill skill) => 0; public float GetRadius(Skill skill) => 0f; public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => 0f; - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => 0f; + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) diff --git a/Assets/PerfectWorld/Scripts/Skills/skill491.cs b/Assets/PerfectWorld/Scripts/Skills/skill491.cs index b39fecbdd4..42a28ced0e 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill491.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill491.cs @@ -68,17 +68,17 @@ namespace BrewMonster ~Skill491Stub() { } - public float GetMpcost(Skill skill) => 0f; - public int GetExecutetime(Skill skill) => 0; - public int GetCoolingtime(Skill skill) => 0; + public override float GetMpcost(Skill skill) => 0f; + public override int GetExecutetime(Skill skill) => 0; + public override int GetCoolingtime(Skill skill) => 0; public float GetRadius(Skill skill) => 0f; public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => 0f; - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => 0f; + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) diff --git a/Assets/PerfectWorld/Scripts/Skills/skill5.cs b/Assets/PerfectWorld/Scripts/Skills/skill5.cs index ee1f7ed2fa..bc6ced6403 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill5.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill5.cs @@ -107,10 +107,21 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; + effect = "龙现.sgc"; + doenchant = 0; + dobless = 0; + commoncooldown = 0; + commoncooldowntime = 0; restrict_weapons.Add(0); - effect = ""; + restrict_weapons.Add(1); + restrict_weapons.Add(182); + restrict_weapons.Add(5); + restrict_weapons.Add(292); + restrict_weapons.Add(9); range = new Range(); range.type = 0; + pre_skills = new Dictionary(); + pre_skills.Add(0, 1); #if SKILL_SERVER statestub.Add(new State1()); statestub.Add(new State2()); @@ -120,16 +131,16 @@ namespace BrewMonster ~Skill5Stub() { } - public float GetMpcost(Skill skill) => (float)(1.7 + 8.4 * skill.GetLevel()); - public int GetExecutetime(Skill skill) => 500; - public int GetCoolingtime(Skill skill) => 6000; + public override float GetMpcost(Skill skill) => (float)(1.7 + 8.4 * skill.GetLevel()); + public override int GetExecutetime(Skill skill) => 500; + public override int GetCoolingtime(Skill skill) => 6000; public float GetRadius(Skill skill) => 0f; public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => (float)(7 + skill.GetLevel() * 0.3); - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => (float)(7 + skill.GetLevel() * 0.3); + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) diff --git a/Assets/PerfectWorld/Scripts/Skills/skill53.cs b/Assets/PerfectWorld/Scripts/Skills/skill53.cs index 0754e68778..1f0702aa70 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill53.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill53.cs @@ -65,16 +65,16 @@ namespace BrewMonster ~Skill53Stub() { } - public float GetMpcost(Skill skill) => 0f; - public int GetExecutetime(Skill skill) => 0; - public int GetCoolingtime(Skill skill) => 0; + public override float GetMpcost(Skill skill) => 0f; + public override int GetExecutetime(Skill skill) => 0; + public override int GetCoolingtime(Skill skill) => 0; public float GetRadius(Skill skill) => 0f; public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => 0f; - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => 0f; + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) diff --git a/Assets/PerfectWorld/Scripts/Skills/skill54.cs b/Assets/PerfectWorld/Scripts/Skills/skill54.cs index 889380ef7c..2b6ebbb065 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill54.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill54.cs @@ -108,10 +108,21 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; + effect = "流水.sgc"; + doenchant = 0; + dobless = 0; + commoncooldown = 0; + commoncooldowntime = 0; restrict_weapons.Add(0); - effect = ""; + restrict_weapons.Add(1); + restrict_weapons.Add(182); + restrict_weapons.Add(5); + restrict_weapons.Add(292); + restrict_weapons.Add(9); range = new Range(); range.type = 0; + pre_skills = new Dictionary(); + pre_skills.Add(2, 1); #if SKILL_SERVER statestub.Add(new State1()); statestub.Add(new State2()); @@ -121,22 +132,25 @@ namespace BrewMonster ~Skill54Stub() { } - public float GetMpcost(Skill skill) => (float)(5.6 + 7 * skill.GetLevel()); - public int GetExecutetime(Skill skill) => 1000; - public int GetCoolingtime(Skill skill) => 3000; + public override float GetMpcost(Skill skill) => (float)(5.6 + 7 * skill.GetLevel()); + public override int GetExecutetime(Skill skill) => 1000; + public override int GetCoolingtime(Skill skill) => 3000; public float GetRadius(Skill skill) => 0f; public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => (float)(skill.GetPlayer().GetRange()); - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => (float)(skill.GetPlayer().GetRange()); + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) { - string result = string.Format(format, skill.GetLevel(), 5.6 + 7 * skill.GetLevel(), 2.9 * skill.GetLevel() * skill.GetLevel() + 89.9 * skill.GetLevel() + 174.6); + string result = string.Format(format, + skill.GetLevel(), + 5.6 + 7 * skill.GetLevel(), + 2.9 * skill.GetLevel() * skill.GetLevel() + 89.9 * skill.GetLevel() + 174.6); if (result.Length < length) { buffer.Append(result); diff --git a/Assets/PerfectWorld/Scripts/Skills/skill55.cs b/Assets/PerfectWorld/Scripts/Skills/skill55.cs index 4f1f00d532..e8cf526dff 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill55.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill55.cs @@ -107,10 +107,21 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; + effect = "狂龙斩.sgc"; + doenchant = 0; + dobless = 0; + commoncooldown = 0; + commoncooldowntime = 0; restrict_weapons.Add(0); - effect = ""; + restrict_weapons.Add(1); + restrict_weapons.Add(182); + restrict_weapons.Add(5); + restrict_weapons.Add(292); + restrict_weapons.Add(9); range = new Range(); - range.type = 0; + range.type = 4; + pre_skills = new Dictionary(); + pre_skills.Add(57, 1); #if SKILL_SERVER statestub.Add(new State1()); statestub.Add(new State2()); @@ -120,21 +131,24 @@ namespace BrewMonster ~Skill55Stub() { } - public float GetMpcost(Skill skill) => (float)(60.9 + 10.5 * skill.GetLevel()); - public int GetExecutetime(Skill skill) => 700; - public int GetCoolingtime(Skill skill) => 8000; + public override float GetMpcost(Skill skill) => (float)(60.9 + 10.5 * skill.GetLevel()); + public override int GetExecutetime(Skill skill) => 700; + public override int GetCoolingtime(Skill skill) => 8000; public float GetRadius(Skill skill) => 8f; public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 120); - public float GetPraydistance(Skill skill) => (float)(skill.GetPlayer().GetRange()); - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => (float)(skill.GetPlayer().GetRange()); + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) { - string result = string.Format(format, skill.GetLevel(), 60.9 + 10.5 * skill.GetLevel(), 2.2 * skill.GetLevel() * skill.GetLevel() + 106.7 * skill.GetLevel() + 522.4); + string result = string.Format(format, + skill.GetLevel(), + 60.9 + 10.5 * skill.GetLevel(), + 2.2 * skill.GetLevel() * skill.GetLevel() + 106.7 * skill.GetLevel() + 522.4); if (result.Length < length) { buffer.Append(result); diff --git a/Assets/PerfectWorld/Scripts/Skills/skill56.cs b/Assets/PerfectWorld/Scripts/Skills/skill56.cs index e516c302f8..f230566b6e 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill56.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill56.cs @@ -107,10 +107,21 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; + effect = "横扫千军.sgc"; + doenchant = 0; + dobless = 0; + commoncooldown = 0; + commoncooldowntime = 0; restrict_weapons.Add(0); - effect = ""; + restrict_weapons.Add(1); + restrict_weapons.Add(182); + restrict_weapons.Add(5); + restrict_weapons.Add(292); + restrict_weapons.Add(9); range = new Range(); - range.type = 0; + range.type = 2; + pre_skills = new Dictionary(); + pre_skills.Add(55, 1); #if SKILL_SERVER statestub.Add(new State1()); statestub.Add(new State2()); @@ -120,21 +131,24 @@ namespace BrewMonster ~Skill56Stub() { } - public float GetMpcost(Skill skill) => (float)(84 + 8.4 * skill.GetLevel()); - public int GetExecutetime(Skill skill) => 900; - public int GetCoolingtime(Skill skill) => 8000; + public override float GetMpcost(Skill skill) => (float)(84 + 8.4 * skill.GetLevel()); + public override int GetExecutetime(Skill skill) => 900; + public override int GetCoolingtime(Skill skill) => 8000; public float GetRadius(Skill skill) => 8f; public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => (float)(skill.GetPlayer().GetRange()); - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => (float)(skill.GetPlayer().GetRange()); + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) { - string result = string.Format(format, skill.GetLevel(), 84 + 8.4 * skill.GetLevel(), 1.1 * skill.GetLevel() * skill.GetLevel() + 107.6 * skill.GetLevel() + 850.8); + string result = string.Format(format, + skill.GetLevel(), + 84 + 8.4 * skill.GetLevel(), + 1.1 * skill.GetLevel() * skill.GetLevel() + 107.6 * skill.GetLevel() + 850.8); if (result.Length < length) { buffer.Append(result); diff --git a/Assets/PerfectWorld/Scripts/Skills/skill57.cs b/Assets/PerfectWorld/Scripts/Skills/skill57.cs index 8adf2fdb38..e626a1befc 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill57.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill57.cs @@ -107,10 +107,21 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; + effect = "断岩斩.sgc"; + doenchant = 1; + dobless = 0; + commoncooldown = 0; + commoncooldowntime = 0; restrict_weapons.Add(0); - effect = ""; + restrict_weapons.Add(1); + restrict_weapons.Add(182); + restrict_weapons.Add(5); + restrict_weapons.Add(292); + restrict_weapons.Add(9); range = new Range(); range.type = 0; + pre_skills = new Dictionary(); + pre_skills.Add(5, 1); #if SKILL_SERVER statestub.Add(new State1()); statestub.Add(new State2()); @@ -120,16 +131,16 @@ namespace BrewMonster ~Skill57Stub() { } - public float GetMpcost(Skill skill) => (float)(29.4 + 7 * skill.GetLevel()); - public int GetExecutetime(Skill skill) => 1000; - public int GetCoolingtime(Skill skill) => 3000; + public override float GetMpcost(Skill skill) => (float)(29.4 + 7 * skill.GetLevel()); + public override int GetExecutetime(Skill skill) => 1000; + public override int GetCoolingtime(Skill skill) => 3000; public float GetRadius(Skill skill) => 0f; public float GetAttackdistance(Skill skill) => (float)(skill.GetPlayer().GetRange() + 3 + 0.3 * skill.GetLevel()); public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => (float)(skill.GetPlayer().GetRange()); - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => (float)(skill.GetPlayer().GetRange()); + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) @@ -151,10 +162,7 @@ namespace BrewMonster #if SKILL_SERVER public int GetEnmity(Skill skill) => 0; - public bool StateAttack(Skill skill) - { - return true; - } + public bool StateAttack(Skill skill) => true; public bool TakeEffect(Skill skill) => true; public float GetEffectdistance(Skill skill) => 14.9f; public int GetAttackspeed(Skill skill) => 6; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill58.cs b/Assets/PerfectWorld/Scripts/Skills/skill58.cs index 10753e8455..18ab441fcf 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill58.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill58.cs @@ -102,10 +102,21 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; + effect = "龙腾.sgc"; + doenchant = 1; + dobless = 0; + commoncooldown = 0; + commoncooldowntime = 0; restrict_weapons.Add(0); - effect = ""; + restrict_weapons.Add(1); + restrict_weapons.Add(182); + restrict_weapons.Add(5); + restrict_weapons.Add(292); + restrict_weapons.Add(9); range = new Range(); - range.type = 0; + range.type = 5; + pre_skills = new Dictionary(); + pre_skills.Add(0, 1); #if SKILL_SERVER statestub.Add(new State1()); statestub.Add(new State2()); @@ -115,21 +126,24 @@ namespace BrewMonster ~Skill58Stub() { } - public float GetMpcost(Skill skill) => 0f; - public int GetExecutetime(Skill skill) => 1000; - public int GetCoolingtime(Skill skill) => 16000 - 1000 * skill.GetLevel(); + public override float GetMpcost(Skill skill) => 0f; + public override int GetExecutetime(Skill skill) => 1000; + public override int GetCoolingtime(Skill skill) => 16000 - 1000 * skill.GetLevel(); public float GetRadius(Skill skill) => 0f; public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => (float)(-10 - 0.6 * skill.GetLevel()); - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => (float)(-10 - 0.6 * skill.GetLevel()); + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) { - string result = string.Format(format, skill.GetLevel(), 16 - skill.GetLevel(), 10 + 0.6 * skill.GetLevel()); + string result = string.Format(format, + skill.GetLevel(), + 16 - skill.GetLevel(), + 10 + 0.6 * skill.GetLevel()); if (result.Length < length) { buffer.Append(result); @@ -141,10 +155,7 @@ namespace BrewMonster #if SKILL_SERVER public int GetEnmity(Skill skill) => 0; - public bool StateAttack(Skill skill) - { - return true; - } + public bool StateAttack(Skill skill) => true; public bool TakeEffect(Skill skill) => true; public float GetEffectdistance(Skill skill) => 20f; public int GetAttackspeed(Skill skill) => 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill59.cs b/Assets/PerfectWorld/Scripts/Skills/skill59.cs index ddfd9cccf9..4fc01ea830 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill59.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill59.cs @@ -102,10 +102,21 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; + effect = "虎跃.sgc"; + doenchant = 1; + dobless = 0; + commoncooldown = 0; + commoncooldowntime = 0; restrict_weapons.Add(0); - effect = ""; + restrict_weapons.Add(1); + restrict_weapons.Add(182); + restrict_weapons.Add(5); + restrict_weapons.Add(292); + restrict_weapons.Add(9); range = new Range(); - range.type = 0; + range.type = 5; + pre_skills = new Dictionary(); + pre_skills.Add(0, 1); #if SKILL_SERVER statestub.Add(new State1()); statestub.Add(new State2()); @@ -115,21 +126,24 @@ namespace BrewMonster ~Skill59Stub() { } - public float GetMpcost(Skill skill) => 0f; - public int GetExecutetime(Skill skill) => 1000; - public int GetCoolingtime(Skill skill) => 16000 - 1000 * skill.GetLevel(); + public override float GetMpcost(Skill skill) => 0f; + public override int GetExecutetime(Skill skill) => 1000; + public override int GetCoolingtime(Skill skill) => 16000 - 1000 * skill.GetLevel(); public float GetRadius(Skill skill) => 0f; public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => (float)(10 + 0.6 * skill.GetLevel()); - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => (float)(10 + 0.6 * skill.GetLevel()); + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) { - string result = string.Format(format, skill.GetLevel(), 16 - skill.GetLevel(), 10 + 0.6 * skill.GetLevel()); + string result = string.Format(format, + skill.GetLevel(), + 16 - skill.GetLevel(), + 10 + 0.6 * skill.GetLevel()); if (result.Length < length) { buffer.Append(result); @@ -141,10 +155,7 @@ namespace BrewMonster #if SKILL_SERVER public int GetEnmity(Skill skill) => 0; - public bool StateAttack(Skill skill) - { - return true; - } + public bool StateAttack(Skill skill) => true; public bool TakeEffect(Skill skill) => true; public float GetEffectdistance(Skill skill) => 25f; public int GetAttackspeed(Skill skill) => 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill6.cs b/Assets/PerfectWorld/Scripts/Skills/skill6.cs index 90fbc27e83..b324b78039 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill6.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill6.cs @@ -57,7 +57,6 @@ namespace BrewMonster dobless = 0; commoncooldown = 0; commoncooldowntime = 0; - effect = ""; range = new Range(); range.type = 0; pre_skills = new Dictionary(); @@ -67,16 +66,16 @@ namespace BrewMonster ~Skill6Stub() { } - public float GetMpcost(Skill skill) => 0f; - public int GetExecutetime(Skill skill) => 0; - public int GetCoolingtime(Skill skill) => 0; + public override float GetMpcost(Skill skill) => 0f; + public override int GetExecutetime(Skill skill) => 0; + public override int GetCoolingtime(Skill skill) => 0; public float GetRadius(Skill skill) => 0f; public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => 0f; - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => 0f; + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) diff --git a/Assets/PerfectWorld/Scripts/Skills/skill60.cs b/Assets/PerfectWorld/Scripts/Skills/skill60.cs index a5f125f447..ce2f72eeed 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill60.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill60.cs @@ -107,10 +107,17 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; + effect = "劈空掌.sgc"; + doenchant = 1; + dobless = 0; + commoncooldown = 0; + commoncooldowntime = 0; restrict_weapons.Add(182); - effect = ""; + restrict_weapons.Add(0); range = new Range(); range.type = 0; + pre_skills = new Dictionary(); + pre_skills.Add(3, 1); #if SKILL_SERVER statestub.Add(new State1()); statestub.Add(new State2()); @@ -120,16 +127,16 @@ namespace BrewMonster ~Skill60Stub() { } - public float GetMpcost(Skill skill) => (float)(33.6 + 7 * skill.GetLevel()); - public int GetExecutetime(Skill skill) => 700; - public int GetCoolingtime(Skill skill) => 15000; + public override float GetMpcost(Skill skill) => (float)(33.6 + 7 * skill.GetLevel()); + public override int GetExecutetime(Skill skill) => 700; + public override int GetCoolingtime(Skill skill) => 15000; public float GetRadius(Skill skill) => 0f; public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => (float)(skill.GetPlayer().GetRange()); - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => (float)(skill.GetPlayer().GetRange()); + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) @@ -150,10 +157,7 @@ namespace BrewMonster #if SKILL_SERVER public int GetEnmity(Skill skill) => 300; - public bool StateAttack(Skill skill) - { - return true; - } + public bool StateAttack(Skill skill) => true; public bool TakeEffect(Skill skill) => true; public float GetEffectdistance(Skill skill) => 12.5f; public int GetAttackspeed(Skill skill) => 10; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill61.cs b/Assets/PerfectWorld/Scripts/Skills/skill61.cs index 4b60367297..797f6fd683 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill61.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill61.cs @@ -107,10 +107,17 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; + effect = "无影脚.sgc"; + doenchant = 1; + dobless = 0; + commoncooldown = 0; + commoncooldowntime = 0; restrict_weapons.Add(182); - effect = ""; + restrict_weapons.Add(0); range = new Range(); range.type = 0; + pre_skills = new Dictionary(); + pre_skills.Add(60, 1); #if SKILL_SERVER statestub.Add(new State1()); statestub.Add(new State2()); @@ -120,21 +127,24 @@ namespace BrewMonster ~Skill61Stub() { } - public float GetMpcost(Skill skill) => (float)(58.8 + 6.7 * skill.GetLevel()); - public int GetExecutetime(Skill skill) => 1200; - public int GetCoolingtime(Skill skill) => 12000; + public override float GetMpcost(Skill skill) => (float)(58.8 + 6.7 * skill.GetLevel()); + public override int GetExecutetime(Skill skill) => 1200; + public override int GetCoolingtime(Skill skill) => 12000; public float GetRadius(Skill skill) => 0f; public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => (float)(skill.GetPlayer().GetRange()); - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => (float)(skill.GetPlayer().GetRange()); + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) { - string result = string.Format(format, skill.GetLevel(), 58.8 + 6.7 * skill.GetLevel(), 1.9 * skill.GetLevel() * skill.GetLevel() + 135.2 * skill.GetLevel() + 931.4); + string result = string.Format(format, + skill.GetLevel(), + 58.8 + 6.7 * skill.GetLevel(), + 1.9 * skill.GetLevel() * skill.GetLevel() + 135.2 * skill.GetLevel() + 931.4); if (result.Length < length) { buffer.Append(result); @@ -146,10 +156,7 @@ namespace BrewMonster #if SKILL_SERVER public int GetEnmity(Skill skill) => 0; - public bool StateAttack(Skill skill) - { - return true; - } + public bool StateAttack(Skill skill) => true; public bool TakeEffect(Skill skill) => true; public float GetEffectdistance(Skill skill) => 15.7f; public int GetAttackspeed(Skill skill) => 10; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill62.cs b/Assets/PerfectWorld/Scripts/Skills/skill62.cs index 8331e487ee..0ac870a19d 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill62.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill62.cs @@ -107,10 +107,17 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; + effect = "风卷残云.sgc"; + doenchant = 0; + dobless = 1; + commoncooldown = 0; + commoncooldowntime = 0; restrict_weapons.Add(182); - effect = ""; + restrict_weapons.Add(0); range = new Range(); - range.type = 0; + range.type = 2; + pre_skills = new Dictionary(); + pre_skills.Add(61, 1); #if SKILL_SERVER statestub.Add(new State1()); statestub.Add(new State2()); @@ -120,16 +127,16 @@ namespace BrewMonster ~Skill62Stub() { } - public float GetMpcost(Skill skill) => (float)(94.5 + 8.4 * skill.GetLevel()); - public int GetExecutetime(Skill skill) => 1800; - public int GetCoolingtime(Skill skill) => 15000; + public override float GetMpcost(Skill skill) => (float)(94.5 + 8.4 * skill.GetLevel()); + public override int GetExecutetime(Skill skill) => 1800; + public override int GetCoolingtime(Skill skill) => 15000; public float GetRadius(Skill skill) => 8f; public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => (float)(skill.GetPlayer().GetRange()); - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => (float)(skill.GetPlayer().GetRange()); + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) @@ -152,10 +159,7 @@ namespace BrewMonster #if SKILL_SERVER public int GetEnmity(Skill skill) => 0; - public bool BlessMe(Skill skill) - { - return true; - } + public bool BlessMe(Skill skill) => true; public bool TakeEffect(Skill skill) => true; public float GetEffectdistance(Skill skill) => 8f; public int GetAttackspeed(Skill skill) => 16; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill63.cs b/Assets/PerfectWorld/Scripts/Skills/skill63.cs index 8ecf4cafd1..b1a8e6c0a7 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill63.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill63.cs @@ -107,10 +107,17 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; + effect = "云龙九现.sgc"; + doenchant = 0; + dobless = 1; + commoncooldown = 0; + commoncooldowntime = 0; restrict_weapons.Add(182); - effect = ""; + restrict_weapons.Add(0); range = new Range(); - range.type = 0; + range.type = 1; + pre_skills = new Dictionary(); + pre_skills.Add(62, 1); #if SKILL_SERVER statestub.Add(new State1()); statestub.Add(new State2()); @@ -120,16 +127,16 @@ namespace BrewMonster ~Skill63Stub() { } - public float GetMpcost(Skill skill) => (float)(156.8 + 8.4 * skill.GetLevel()); - public int GetExecutetime(Skill skill) => 1000; - public int GetCoolingtime(Skill skill) => 30000; + public override float GetMpcost(Skill skill) => (float)(156.8 + 8.4 * skill.GetLevel()); + public override int GetExecutetime(Skill skill) => 1000; + public override int GetCoolingtime(Skill skill) => 30000; public float GetRadius(Skill skill) => 4f; public float GetAttackdistance(Skill skill) => (float)(8 + 0.4 * skill.GetLevel()); public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => (float)(skill.GetPlayer().GetRange()); - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => (float)(skill.GetPlayer().GetRange()); + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) @@ -152,10 +159,7 @@ namespace BrewMonster #if SKILL_SERVER public int GetEnmity(Skill skill) => 1000; - public bool BlessMe(Skill skill) - { - return true; - } + public bool BlessMe(Skill skill) => true; public bool TakeEffect(Skill skill) => true; public float GetEffectdistance(Skill skill) => 20f; public int GetAttackspeed(Skill skill) => 11; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill64.cs b/Assets/PerfectWorld/Scripts/Skills/skill64.cs index ad60ac8fb5..eac915f1e1 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill64.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill64.cs @@ -107,10 +107,16 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; + effect = "疾风霹雳.sgc"; + doenchant = 1; + dobless = 0; + commoncooldown = 0; + commoncooldowntime = 0; restrict_weapons.Add(5); - effect = ""; range = new Range(); - range.type = 0; + range.type = 1; + pre_skills = new Dictionary(); + pre_skills.Add(3, 1); #if SKILL_SERVER statestub.Add(new State1()); statestub.Add(new State2()); @@ -120,16 +126,16 @@ namespace BrewMonster ~Skill64Stub() { } - public float GetMpcost(Skill skill) => (float)(33.6 + 7 * skill.GetLevel()); - public int GetExecutetime(Skill skill) => 800; - public int GetCoolingtime(Skill skill) => 15000; + public override float GetMpcost(Skill skill) => (float)(33.6 + 7 * skill.GetLevel()); + public override int GetExecutetime(Skill skill) => 800; + public override int GetCoolingtime(Skill skill) => 15000; public float GetRadius(Skill skill) => 3.5f; public float GetAttackdistance(Skill skill) => (float)(8 + 0.4 * skill.GetLevel()); public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => (float)(skill.GetPlayer().GetRange()); - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => (float)(skill.GetPlayer().GetRange()); + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) @@ -151,10 +157,7 @@ namespace BrewMonster #if SKILL_SERVER public int GetEnmity(Skill skill) => 300; - public bool StateAttack(Skill skill) - { - return true; - } + public bool StateAttack(Skill skill) => true; public bool TakeEffect(Skill skill) => true; public float GetEffectdistance(Skill skill) => 6f; public int GetAttackspeed(Skill skill) => 4; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill65.cs b/Assets/PerfectWorld/Scripts/Skills/skill65.cs index 470a8474d7..609263830e 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill65.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill65.cs @@ -107,10 +107,16 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; + effect = "回马枪.sgc"; + doenchant = 0; + dobless = 0; + commoncooldown = 0; + commoncooldowntime = 0; restrict_weapons.Add(5); - effect = ""; range = new Range(); range.type = 0; + pre_skills = new Dictionary(); + pre_skills.Add(64, 1); #if SKILL_SERVER statestub.Add(new State1()); statestub.Add(new State2()); @@ -120,16 +126,16 @@ namespace BrewMonster ~Skill65Stub() { } - public float GetMpcost(Skill skill) => (float)(58.8 + 6.7 * skill.GetLevel()); - public int GetExecutetime(Skill skill) => 1200; - public int GetCoolingtime(Skill skill) => 6000; + public override float GetMpcost(Skill skill) => (float)(58.8 + 6.7 * skill.GetLevel()); + public override int GetExecutetime(Skill skill) => 1200; + public override int GetCoolingtime(Skill skill) => 6000; public float GetRadius(Skill skill) => 0f; public float GetAttackdistance(Skill skill) => (float)(skill.GetPlayer().GetRange() + 0.3 * skill.GetLevel()); public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => (float)(10 + 0.5 * skill.GetLevel() + skill.GetPlayer().GetRange() - 4.5); - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => (float)(10 + 0.5 * skill.GetLevel() + skill.GetPlayer().GetRange() - 4.5); + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) diff --git a/Assets/PerfectWorld/Scripts/Skills/skill66.cs b/Assets/PerfectWorld/Scripts/Skills/skill66.cs index f087a7a317..49a6a4747f 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill66.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill66.cs @@ -107,10 +107,16 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; + effect = "流星赶月.sgc"; + doenchant = 1; + dobless = 0; + commoncooldown = 0; + commoncooldowntime = 0; restrict_weapons.Add(5); - effect = ""; range = new Range(); - range.type = 0; + range.type = 1; + pre_skills = new Dictionary(); + pre_skills.Add(65, 1); #if SKILL_SERVER statestub.Add(new State1()); statestub.Add(new State2()); @@ -120,16 +126,16 @@ namespace BrewMonster ~Skill66Stub() { } - public float GetMpcost(Skill skill) => (float)(75.6 + 6.7 * skill.GetLevel()); - public int GetExecutetime(Skill skill) => 800; - public int GetCoolingtime(Skill skill) => 6000; + public override float GetMpcost(Skill skill) => (float)(75.6 + 6.7 * skill.GetLevel()); + public override int GetExecutetime(Skill skill) => 800; + public override int GetCoolingtime(Skill skill) => 6000; public float GetRadius(Skill skill) => 3f; public float GetAttackdistance(Skill skill) => (float)(9 + 0.3 * skill.GetLevel()); public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => (float)(skill.GetPlayer().GetRange()); - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => (float)(skill.GetPlayer().GetRange()); + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) @@ -151,10 +157,7 @@ namespace BrewMonster #if SKILL_SERVER public int GetEnmity(Skill skill) => 0; - public bool StateAttack(Skill skill) - { - return true; - } + public bool StateAttack(Skill skill) => true; public bool TakeEffect(Skill skill) => true; public float GetEffectdistance(Skill skill) => 8f; public int GetAttackspeed(Skill skill) => 6; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill67.cs b/Assets/PerfectWorld/Scripts/Skills/skill67.cs index b48faba6a9..c698316e41 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill67.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill67.cs @@ -107,10 +107,16 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; + effect = "刃域.sgc"; + doenchant = 1; + dobless = 0; + commoncooldown = 0; + commoncooldowntime = 0; restrict_weapons.Add(5); - effect = ""; range = new Range(); - range.type = 0; + range.type = 2; + pre_skills = new Dictionary(); + pre_skills.Add(66, 1); #if SKILL_SERVER statestub.Add(new State1()); statestub.Add(new State2()); @@ -120,16 +126,16 @@ namespace BrewMonster ~Skill67Stub() { } - public float GetMpcost(Skill skill) => (float)(156.8 + 8.4 * skill.GetLevel()); - public int GetExecutetime(Skill skill) => 1800; - public int GetCoolingtime(Skill skill) => 30000; + public override float GetMpcost(Skill skill) => (float)(156.8 + 8.4 * skill.GetLevel()); + public override int GetExecutetime(Skill skill) => 1800; + public override int GetCoolingtime(Skill skill) => 30000; public float GetRadius(Skill skill) => 12f; public float GetAttackdistance(Skill skill) => (float)(skill.GetPlayer().GetRange() + 0.4 * skill.GetLevel()); public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => (float)(skill.GetPlayer().GetRange()); - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => (float)(skill.GetPlayer().GetRange()); + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) @@ -151,10 +157,7 @@ namespace BrewMonster #if SKILL_SERVER public int GetEnmity(Skill skill) => 1000; - public bool StateAttack(Skill skill) - { - return true; - } + public bool StateAttack(Skill skill) => true; public bool TakeEffect(Skill skill) => true; public float GetEffectdistance(Skill skill) => 8f; public int GetAttackspeed(Skill skill) => 16; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill68.cs b/Assets/PerfectWorld/Scripts/Skills/skill68.cs index 8b0e1db396..76111fd021 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill68.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill68.cs @@ -108,10 +108,16 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; + effect = "霸王龙飞.sgc"; + doenchant = 1; + dobless = 0; + commoncooldown = 0; + commoncooldowntime = 0; restrict_weapons.Add(9); - effect = ""; range = new Range(); range.type = 0; + pre_skills = new Dictionary(); + pre_skills.Add(3, 1); #if SKILL_SERVER statestub.Add(new State1()); statestub.Add(new State2()); @@ -121,16 +127,16 @@ namespace BrewMonster ~Skill68Stub() { } - public float GetMpcost(Skill skill) => (float)(33.6 + 7 * skill.GetLevel()); - public int GetExecutetime(Skill skill) => 1500; - public int GetCoolingtime(Skill skill) => 15000; + public override float GetMpcost(Skill skill) => (float)(33.6 + 7 * skill.GetLevel()); + public override int GetExecutetime(Skill skill) => 1500; + public override int GetCoolingtime(Skill skill) => 15000; public float GetRadius(Skill skill) => 0f; public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => (float)(skill.GetPlayer().GetRange()); - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => (float)(skill.GetPlayer().GetRange()); + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) @@ -152,10 +158,7 @@ namespace BrewMonster #if SKILL_SERVER public int GetEnmity(Skill skill) => 300; - public bool StateAttack(Skill skill) - { - return true; - } + public bool StateAttack(Skill skill) => true; public bool TakeEffect(Skill skill) => true; public float GetEffectdistance(Skill skill) => 19.7f; public int GetAttackspeed(Skill skill) => 13; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill69.cs b/Assets/PerfectWorld/Scripts/Skills/skill69.cs index d5d56fc16e..44fde88c0a 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill69.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill69.cs @@ -107,10 +107,16 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; + effect = "霸王献鼎.sgc"; + doenchant = 1; + dobless = 0; + commoncooldown = 0; + commoncooldowntime = 0; restrict_weapons.Add(9); - effect = ""; range = new Range(); - range.type = 0; + range.type = 3; + pre_skills = new Dictionary(); + pre_skills.Add(71, 1); #if SKILL_SERVER statestub.Add(new State1()); statestub.Add(new State2()); @@ -120,16 +126,16 @@ namespace BrewMonster ~Skill69Stub() { } - public float GetMpcost(Skill skill) => (float)(156.8 + 8.4 * skill.GetLevel()); - public int GetExecutetime(Skill skill) => 1500; - public int GetCoolingtime(Skill skill) => 30000; + public override float GetMpcost(Skill skill) => (float)(156.8 + 8.4 * skill.GetLevel()); + public override int GetExecutetime(Skill skill) => 1500; + public override int GetCoolingtime(Skill skill) => 30000; public float GetRadius(Skill skill) => 12f; public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 *(60 + 2.5 * skill.GetLevel())); - public float GetPraydistance(Skill skill) => 8f; - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => 8f; + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) @@ -151,10 +157,7 @@ namespace BrewMonster #if SKILL_SERVER public int GetEnmity(Skill skill) => 1000; - public bool StateAttack(Skill skill) - { - return true; - } + public bool StateAttack(Skill skill) => true; public bool TakeEffect(Skill skill) => true; public float GetEffectdistance(Skill skill) => 19.7f; public int GetAttackspeed(Skill skill) => 14; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill7.cs b/Assets/PerfectWorld/Scripts/Skills/skill7.cs index 76d8a1cfcc..7778aeb749 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill7.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill7.cs @@ -107,10 +107,17 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; + effect = "火煞天灯.sgc"; + doenchant = 1; + dobless = 0; + commoncooldown = 0; + commoncooldowntime = 0; restrict_weapons.Add(292); - effect = ""; + restrict_weapons.Add(0); range = new Range(); range.type = 0; + pre_skills = new Dictionary(); + pre_skills.Add(96, 1); #if SKILL_SERVER statestub.Add(new State1()); statestub.Add(new State2()); @@ -120,16 +127,16 @@ namespace BrewMonster ~Skill7Stub() { } - public float GetMpcost(Skill skill) => (float)(24 + 15 * skill.GetLevel()); - public int GetExecutetime(Skill skill) => 1000; - public int GetCoolingtime(Skill skill) => 8000; + public override float GetMpcost(Skill skill) => (float)(24 + 15 * skill.GetLevel()); + public override int GetExecutetime(Skill skill) => 1000; + public override int GetCoolingtime(Skill skill) => 8000; public float GetRadius(Skill skill) => 0f; public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => (float)(19.5 + 0.9 * skill.GetLevel()); - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => (float)(19.5 + 0.9 * skill.GetLevel()); + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) @@ -150,10 +157,7 @@ namespace BrewMonster #if SKILL_SERVER public int GetEnmity(Skill skill) => 0; - public bool StateAttack(Skill skill) - { - return true; - } + public bool StateAttack(Skill skill) => true; public bool TakeEffect(Skill skill) => true; public float GetEffectdistance(Skill skill) => 25 + skill.GetLevel(); public int GetAttackspeed(Skill skill) => 9; @@ -163,28 +167,3 @@ namespace BrewMonster } - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/Assets/PerfectWorld/Scripts/Skills/skill70.cs b/Assets/PerfectWorld/Scripts/Skills/skill70.cs index e884880182..db1753443a 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill70.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill70.cs @@ -107,10 +107,16 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; + effect = "霸王断岳.sgc"; + doenchant = 0; + dobless = 0; + commoncooldown = 0; + commoncooldowntime = 0; restrict_weapons.Add(9); - effect = ""; range = new Range(); - range.type = 0; + range.type = 2; + pre_skills = new Dictionary(); + pre_skills.Add(68, 1); #if SKILL_SERVER statestub.Add(new State1()); statestub.Add(new State2()); @@ -120,16 +126,16 @@ namespace BrewMonster ~Skill70Stub() { } - public float GetMpcost(Skill skill) => (float)(73.5 + 8.4 * skill.GetLevel()); - public int GetExecutetime(Skill skill) => 2000; - public int GetCoolingtime(Skill skill) => 6000; + public override float GetMpcost(Skill skill) => (float)(73.5 + 8.4 * skill.GetLevel()); + public override int GetExecutetime(Skill skill) => 2000; + public override int GetCoolingtime(Skill skill) => 6000; public float GetRadius(Skill skill) => 10f; public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 *(20 + 3 * skill.GetLevel())); - public float GetPraydistance(Skill skill) => (float)(skill.GetPlayer().GetRange()); - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => (float)(skill.GetPlayer().GetRange()); + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) diff --git a/Assets/PerfectWorld/Scripts/Skills/skill71.cs b/Assets/PerfectWorld/Scripts/Skills/skill71.cs index b62d3ccf50..de7344883b 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill71.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill71.cs @@ -107,10 +107,16 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; + effect = "霸王暴怒.sgc"; + doenchant = 1; + dobless = 0; + commoncooldown = 0; + commoncooldowntime = 0; restrict_weapons.Add(9); - effect = ""; range = new Range(); - range.type = 0; + range.type = 2; + pre_skills = new Dictionary(); + pre_skills.Add(70, 1); #if SKILL_SERVER statestub.Add(new State1()); statestub.Add(new State2()); @@ -120,16 +126,16 @@ namespace BrewMonster ~Skill71Stub() { } - public float GetMpcost(Skill skill) => (float)(94.5 + 8.4 * skill.GetLevel()); - public int GetExecutetime(Skill skill) => 1400; - public int GetCoolingtime(Skill skill) => 8000; + public override float GetMpcost(Skill skill) => (float)(94.5 + 8.4 * skill.GetLevel()); + public override int GetExecutetime(Skill skill) => 1400; + public override int GetCoolingtime(Skill skill) => 8000; public float GetRadius(Skill skill) => 10f; public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 *(20 + 3 * skill.GetLevel())); - public float GetPraydistance(Skill skill) => (float)(skill.GetPlayer().GetRange()); - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => (float)(skill.GetPlayer().GetRange()); + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) @@ -151,10 +157,7 @@ namespace BrewMonster #if SKILL_SERVER public int GetEnmity(Skill skill) => 0; - public bool StateAttack(Skill skill) - { - return true; - } + public bool StateAttack(Skill skill) => true; public bool TakeEffect(Skill skill) => true; public float GetEffectdistance(Skill skill) => 0f; public int GetAttackspeed(Skill skill) => 11; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill72.cs b/Assets/PerfectWorld/Scripts/Skills/skill72.cs index d32dbd9f36..2403c04e9f 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill72.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill72.cs @@ -107,10 +107,16 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; + effect = "忘情式.sgc"; + doenchant = 1; + dobless = 0; + commoncooldown = 0; + commoncooldowntime = 0; restrict_weapons.Add(1); - effect = ""; range = new Range(); range.type = 0; + pre_skills = new Dictionary(); + pre_skills.Add(3, 1); #if SKILL_SERVER statestub.Add(new State1()); statestub.Add(new State2()); @@ -120,16 +126,16 @@ namespace BrewMonster ~Skill72Stub() { } - public float GetMpcost(Skill skill) => (float)(33.6 + 7 * skill.GetLevel()); - public int GetExecutetime(Skill skill) => 700; - public int GetCoolingtime(Skill skill) => 15000; + public override float GetMpcost(Skill skill) => (float)(33.6 + 7 * skill.GetLevel()); + public override int GetExecutetime(Skill skill) => 700; + public override int GetCoolingtime(Skill skill) => 15000; public float GetRadius(Skill skill) => 0f; public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => (float)(skill.GetPlayer().GetRange()); - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => (float)(skill.GetPlayer().GetRange()); + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) @@ -150,10 +156,7 @@ namespace BrewMonster #if SKILL_SERVER public int GetEnmity(Skill skill) => 300; - public bool StateAttack(Skill skill) - { - return true; - } + public bool StateAttack(Skill skill) => true; public bool TakeEffect(Skill skill) => true; public float GetEffectdistance(Skill skill) => 13.3f; public int GetAttackspeed(Skill skill) => 2; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill73.cs b/Assets/PerfectWorld/Scripts/Skills/skill73.cs index 44d776027f..a28f8af1bf 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill73.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill73.cs @@ -107,10 +107,16 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; + effect = "追魂诀.sgc"; + doenchant = 0; + dobless = 0; + commoncooldown = 0; + commoncooldowntime = 0; restrict_weapons.Add(1); - effect = ""; range = new Range(); range.type = 0; + pre_skills = new Dictionary(); + pre_skills.Add(72, 1); #if SKILL_SERVER statestub.Add(new State1()); statestub.Add(new State2()); @@ -120,16 +126,16 @@ namespace BrewMonster ~Skill73Stub() { } - public float GetMpcost(Skill skill) => (float)(49 + 5.6 * skill.GetLevel()); - public int GetExecutetime(Skill skill) => 900; - public int GetCoolingtime(Skill skill) => 6000; + public override float GetMpcost(Skill skill) => (float)(49 + 5.6 * skill.GetLevel()); + public override int GetExecutetime(Skill skill) => 900; + public override int GetCoolingtime(Skill skill) => 6000; public float GetRadius(Skill skill) => 0f; public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => (float)(9 + 0.3 * skill.GetLevel() + skill.GetPlayer().GetRange() - 3); - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => (float)(9 + 0.3 * skill.GetLevel() + skill.GetPlayer().GetRange() - 3); + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) diff --git a/Assets/PerfectWorld/Scripts/Skills/skill74.cs b/Assets/PerfectWorld/Scripts/Skills/skill74.cs index ca8593d9e3..46da916cd3 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill74.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill74.cs @@ -107,10 +107,16 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; + effect = "剑气纵横.sgc"; + doenchant = 1; + dobless = 0; + commoncooldown = 0; + commoncooldowntime = 0; restrict_weapons.Add(1); - effect = ""; range = new Range(); range.type = 0; + pre_skills = new Dictionary(); + pre_skills.Add(73, 1); #if SKILL_SERVER statestub.Add(new State1()); statestub.Add(new State2()); @@ -120,16 +126,16 @@ namespace BrewMonster ~Skill74Stub() { } - public float GetMpcost(Skill skill) => (float)(63 + 5.6 * skill.GetLevel()); - public int GetExecutetime(Skill skill) => 1700; - public int GetCoolingtime(Skill skill) => 8000; + public override float GetMpcost(Skill skill) => (float)(63 + 5.6 * skill.GetLevel()); + public override int GetExecutetime(Skill skill) => 1700; + public override int GetCoolingtime(Skill skill) => 8000; public float GetRadius(Skill skill) => 0f; public float GetAttackdistance(Skill skill) => (float)(skill.GetPlayer().GetRange() + 3 + 0.3 * skill.GetLevel()); public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => (float)(skill.GetPlayer().GetRange()); - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => (float)(skill.GetPlayer().GetRange()); + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) @@ -151,10 +157,7 @@ namespace BrewMonster #if SKILL_SERVER public int GetEnmity(Skill skill) => 0; - public bool StateAttack(Skill skill) - { - return true; - } + public bool StateAttack(Skill skill) => true; public bool TakeEffect(Skill skill) => true; public float GetEffectdistance(Skill skill) => 19.7f; public int GetAttackspeed(Skill skill) => 3; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill75.cs b/Assets/PerfectWorld/Scripts/Skills/skill75.cs index d370a3aa2a..549ddce60a 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill75.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill75.cs @@ -107,10 +107,16 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; + effect = "万剑诀.sgc"; + doenchant = 1; + dobless = 0; + commoncooldown = 0; + commoncooldowntime = 0; restrict_weapons.Add(1); - effect = ""; range = new Range(); - range.type = 0; + range.type = 3; + pre_skills = new Dictionary(); + pre_skills.Add(74, 1); #if SKILL_SERVER statestub.Add(new State1()); statestub.Add(new State2()); @@ -120,16 +126,16 @@ namespace BrewMonster ~Skill75Stub() { } - public float GetMpcost(Skill skill) => (float)(156.8 + 8.4 * skill.GetLevel()); - public int GetExecutetime(Skill skill) => 3000; - public int GetCoolingtime(Skill skill) => 30000; + public override float GetMpcost(Skill skill) => (float)(156.8 + 8.4 * skill.GetLevel()); + public override int GetExecutetime(Skill skill) => 3000; + public override int GetCoolingtime(Skill skill) => 30000; public float GetRadius(Skill skill) => (float)(8 + 0.4 * skill.GetLevel()); public float GetAttackdistance(Skill skill) => (float)(skill.GetPlayer().GetRange() + 0.4 * skill.GetLevel()); public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => (float)(8 + skill.GetPlayer().GetRange() - 3); - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => (float)(8 + skill.GetPlayer().GetRange() - 3); + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) @@ -152,10 +158,7 @@ namespace BrewMonster #if SKILL_SERVER public int GetEnmity(Skill skill) => 1000; - public bool StateAttack(Skill skill) - { - return true; - } + public bool StateAttack(Skill skill) => true; public bool TakeEffect(Skill skill) => true; public float GetEffectdistance(Skill skill) => 20.5f + skill.GetPlayer().GetRange() - 3; public int GetAttackspeed(Skill skill) => 15; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill76.cs b/Assets/PerfectWorld/Scripts/Skills/skill76.cs index 2728e04603..78da0519c6 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill76.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill76.cs @@ -70,10 +70,21 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; + effect = "疾云步.sgc"; + doenchant = 1; + dobless = 0; + commoncooldown = 0; + commoncooldowntime = 0; restrict_weapons.Add(0); - effect = ""; + restrict_weapons.Add(1); + restrict_weapons.Add(182); + restrict_weapons.Add(5); + restrict_weapons.Add(292); + restrict_weapons.Add(9); range = new Range(); - range.type = 0; + range.type = 5; + pre_skills = new Dictionary(); + pre_skills.Add(0, 1); #if SKILL_SERVER statestub.Add(new State1()); #endif @@ -81,21 +92,24 @@ namespace BrewMonster ~Skill76Stub() { } - public float GetMpcost(Skill skill) => (float)(10 + 5 * skill.GetLevel()); - public int GetExecutetime(Skill skill) => 0; - public int GetCoolingtime(Skill skill) => 60000; + public override float GetMpcost(Skill skill) => (float)(10 + 5 * skill.GetLevel()); + public override int GetExecutetime(Skill skill) => 0; + public override int GetCoolingtime(Skill skill) => 60000; public float GetRadius(Skill skill) => 0f; public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => 0f; - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => 0f; + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) { - string result = string.Format(format, skill.GetLevel(), 10 + 5 * skill.GetLevel(), 40 + 5 * skill.GetLevel()); + string result = string.Format(format, + skill.GetLevel(), + 10 + 5 * skill.GetLevel(), + 40 + 5 * skill.GetLevel()); if (result.Length < length) { buffer.Append(result); @@ -107,10 +121,7 @@ namespace BrewMonster #if SKILL_SERVER public int GetEnmity(Skill skill) => 0; - public bool StateAttack(Skill skill) - { - return true; - } + public bool StateAttack(Skill skill) => true; public bool TakeEffect(Skill skill) => true; public float GetEffectdistance(Skill skill) => 5f; public int GetAttackspeed(Skill skill) => 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill77.cs b/Assets/PerfectWorld/Scripts/Skills/skill77.cs index 37f40188b4..db15bf608d 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill77.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill77.cs @@ -104,10 +104,21 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; + effect = "金钟罩.sgc"; + doenchant = 1; + dobless = 0; + commoncooldown = 0; + commoncooldowntime = 0; restrict_weapons.Add(0); - effect = ""; + restrict_weapons.Add(1); + restrict_weapons.Add(182); + restrict_weapons.Add(5); + restrict_weapons.Add(292); + restrict_weapons.Add(9); range = new Range(); - range.type = 0; + range.type = 2; + pre_skills = new Dictionary(); + pre_skills.Add(0, 1); #if SKILL_SERVER statestub.Add(new State1()); statestub.Add(new State2()); @@ -117,21 +128,24 @@ namespace BrewMonster ~Skill77Stub() { } - public float GetMpcost(Skill skill) => (float)(56 + 35 * skill.GetLevel()); - public int GetExecutetime(Skill skill) => 1800; - public int GetCoolingtime(Skill skill) => 3000; + public override float GetMpcost(Skill skill) => (float)(56 + 35 * skill.GetLevel()); + public override int GetExecutetime(Skill skill) => 1800; + public override int GetCoolingtime(Skill skill) => 3000; public float GetRadius(Skill skill) => 16f; public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => 0f; - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => 0f; + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) { - string result = string.Format(format, skill.GetLevel(), 56 + 35 * skill.GetLevel(), 10 + 5 * skill.GetLevel()); + string result = string.Format(format, + skill.GetLevel(), + 56 + 35 * skill.GetLevel(), + 10 + 5 * skill.GetLevel()); if (result.Length < length) { buffer.Append(result); @@ -143,10 +157,7 @@ namespace BrewMonster #if SKILL_SERVER public int GetEnmity(Skill skill) => 0; - public bool StateAttack(Skill skill) - { - return true; - } + public bool StateAttack(Skill skill) => true; public bool TakeEffect(Skill skill) => true; public float GetEffectdistance(Skill skill) => 5f; public int GetAttackspeed(Skill skill) => 9; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill78.cs b/Assets/PerfectWorld/Scripts/Skills/skill78.cs index cba3d793c1..bd76bb8ca0 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill78.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill78.cs @@ -57,7 +57,6 @@ namespace BrewMonster dobless = 0; commoncooldown = 0; commoncooldowntime = 0; - effect = ""; range = new Range(); range.type = 0; pre_skills = new Dictionary(); @@ -67,16 +66,16 @@ namespace BrewMonster ~Skill78Stub() { } - public float GetMpcost(Skill skill) => 0f; - public int GetExecutetime(Skill skill) => 0; - public int GetCoolingtime(Skill skill) => 0; + public override float GetMpcost(Skill skill) => 0f; + public override int GetExecutetime(Skill skill) => 0; + public override int GetCoolingtime(Skill skill) => 0; public float GetRadius(Skill skill) => 0f; public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => 0f; - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => 0f; + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) diff --git a/Assets/PerfectWorld/Scripts/Skills/skill79.cs b/Assets/PerfectWorld/Scripts/Skills/skill79.cs index be49fda34b..e05beaf9f3 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill79.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill79.cs @@ -57,7 +57,6 @@ namespace BrewMonster dobless = 0; commoncooldown = 0; commoncooldowntime = 0; - effect = ""; range = new Range(); range.type = 0; pre_skills = new Dictionary(); @@ -67,16 +66,16 @@ namespace BrewMonster ~Skill79Stub() { } - public float GetMpcost(Skill skill) => 0f; - public int GetExecutetime(Skill skill) => 0; - public int GetCoolingtime(Skill skill) => 0; + public override float GetMpcost(Skill skill) => 0f; + public override int GetExecutetime(Skill skill) => 0; + public override int GetCoolingtime(Skill skill) => 0; public float GetRadius(Skill skill) => 0f; public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => 0f; - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => 0f; + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) diff --git a/Assets/PerfectWorld/Scripts/Skills/skill8.cs b/Assets/PerfectWorld/Scripts/Skills/skill8.cs index 3d50c8f131..8ed493b4ca 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill8.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill8.cs @@ -108,10 +108,17 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; + effect = "血祭炎爆.sgc"; + doenchant = 0; + dobless = 0; + commoncooldown = 0; + commoncooldowntime = 0; restrict_weapons.Add(0); - effect = ""; + restrict_weapons.Add(292); range = new Range(); - range.type = 0; + range.type = 2; + pre_skills = new Dictionary(); + pre_skills.Add(84, 1); #if SKILL_SERVER statestub.Add(new State1()); statestub.Add(new State2()); @@ -121,16 +128,16 @@ namespace BrewMonster ~Skill8Stub() { } - public float GetMpcost(Skill skill) => (float)(135 + 12 * skill.GetLevel()); - public int GetExecutetime(Skill skill) => 1000; - public int GetCoolingtime(Skill skill) => 15000; + public override float GetMpcost(Skill skill) => (float)(135 + 12 * skill.GetLevel()); + public override int GetExecutetime(Skill skill) => 1000; + public override int GetCoolingtime(Skill skill) => 15000; public float GetRadius(Skill skill) => 12f; public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => 6f; - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => 6f; + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) @@ -161,28 +168,3 @@ namespace BrewMonster } - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/Assets/PerfectWorld/Scripts/Skills/skill80.cs b/Assets/PerfectWorld/Scripts/Skills/skill80.cs index 826138a71d..721c0bfb5f 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill80.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill80.cs @@ -57,7 +57,6 @@ namespace BrewMonster dobless = 0; commoncooldown = 0; commoncooldowntime = 0; - effect = ""; range = new Range(); range.type = 0; pre_skills = new Dictionary(); @@ -67,16 +66,16 @@ namespace BrewMonster ~Skill80Stub() { } - public float GetMpcost(Skill skill) => 0f; - public int GetExecutetime(Skill skill) => 0; - public int GetCoolingtime(Skill skill) => 0; + public override float GetMpcost(Skill skill) => 0f; + public override int GetExecutetime(Skill skill) => 0; + public override int GetCoolingtime(Skill skill) => 0; public float GetRadius(Skill skill) => 0f; public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => 0f; - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => 0f; + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) diff --git a/Assets/PerfectWorld/Scripts/Skills/skill81.cs b/Assets/PerfectWorld/Scripts/Skills/skill81.cs index e0ecd06546..5d666fe5df 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill81.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill81.cs @@ -127,16 +127,16 @@ namespace BrewMonster ~Skill81Stub() { } - public float GetMpcost(Skill skill) => (float)(-9 + 15 * skill.GetLevel()); - public int GetExecutetime(Skill skill) => 800; - public int GetCoolingtime(Skill skill) => 3000; + public override float GetMpcost(Skill skill) => (float)(-9 + 15 * skill.GetLevel()); + public override int GetExecutetime(Skill skill) => 800; + public override int GetCoolingtime(Skill skill) => 3000; public float GetRadius(Skill skill) => 0f; public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => (float)(19.5 + 0.9 * skill.GetLevel()); - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => (float)(19.5 + 0.9 * skill.GetLevel()); + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) diff --git a/Assets/PerfectWorld/Scripts/Skills/skill84.cs b/Assets/PerfectWorld/Scripts/Skills/skill84.cs index a76fae0181..8a7602315d 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill84.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill84.cs @@ -127,16 +127,16 @@ namespace BrewMonster ~Skill84Stub() { } - public float GetMpcost(Skill skill) => (float)(157.5 + 18 * skill.GetLevel()); - public int GetExecutetime(Skill skill) => 1000; - public int GetCoolingtime(Skill skill) => 8000; + public override float GetMpcost(Skill skill) => (float)(157.5 + 18 * skill.GetLevel()); + public override int GetExecutetime(Skill skill) => 1000; + public override int GetCoolingtime(Skill skill) => 8000; public float GetRadius(Skill skill) => (float)(3 + 0.2 * skill.GetLevel()); public float GetAttackdistance(Skill skill) => (float)(13 + 0.5 * skill.GetLevel()); public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => 10f; - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => 10f; + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) diff --git a/Assets/PerfectWorld/Scripts/Skills/skill85.cs b/Assets/PerfectWorld/Scripts/Skills/skill85.cs index 1249c4a80e..a6757f8b5c 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill85.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill85.cs @@ -127,16 +127,16 @@ namespace BrewMonster ~Skill85Stub() { } - public float GetMpcost(Skill skill) => (float)(50.4 + 25 * skill.GetLevel()); - public int GetExecutetime(Skill skill) => 1000; - public int GetCoolingtime(Skill skill) => 3000; + public override float GetMpcost(Skill skill) => (float)(50.4 + 25 * skill.GetLevel()); + public override int GetExecutetime(Skill skill) => 1000; + public override int GetCoolingtime(Skill skill) => 3000; public float GetRadius(Skill skill) => (float)(7 + 0.5 * skill.GetLevel()); public float GetAttackdistance(Skill skill) => (float)(4 + 0.3 * skill.GetLevel()); public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => (float)(19.5 + 0.9 * skill.GetLevel()); - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => (float)(19.5 + 0.9 * skill.GetLevel()); + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) diff --git a/Assets/PerfectWorld/Scripts/Skills/skill86.cs b/Assets/PerfectWorld/Scripts/Skills/skill86.cs index 3b4981b9fc..8c818b5863 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill86.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill86.cs @@ -145,16 +145,16 @@ namespace BrewMonster ~Skill86Stub() { } - public float GetMpcost(Skill skill) => (float)(100 + 20 * skill.GetLevel()); - public int GetExecutetime(Skill skill) => -1; - public int GetCoolingtime(Skill skill) => 15000; + public override float GetMpcost(Skill skill) => (float)(100 + 20 * skill.GetLevel()); + public override int GetExecutetime(Skill skill) => -1; + public override int GetCoolingtime(Skill skill) => 15000; public float GetRadius(Skill skill) => 12f; public float GetAttackdistance(Skill skill) => (float)(4 + 0.3 * skill.GetLevel()); public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => 6f; - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => 6f; + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) diff --git a/Assets/PerfectWorld/Scripts/Skills/skill87.cs b/Assets/PerfectWorld/Scripts/Skills/skill87.cs index 2a40ceaa74..e40b2d1e35 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill87.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill87.cs @@ -130,16 +130,16 @@ namespace BrewMonster ~Skill87Stub() { } - public float GetMpcost(Skill skill) => (float)(336 + 18 * skill.GetLevel()); - public int GetExecutetime(Skill skill) => 1800; - public int GetCoolingtime(Skill skill) => 30000; + public override float GetMpcost(Skill skill) => (float)(336 + 18 * skill.GetLevel()); + public override int GetExecutetime(Skill skill) => 1800; + public override int GetCoolingtime(Skill skill) => 30000; public float GetRadius(Skill skill) => (float)(8 + 0.4 * skill.GetLevel()); public float GetAttackdistance(Skill skill) => (float)(4 + 0.3 * skill.GetLevel()); public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => (float)(19.5 + 0.9 * skill.GetLevel()); - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => (float)(19.5 + 0.9 * skill.GetLevel()); + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) diff --git a/Assets/PerfectWorld/Scripts/Skills/skill88.cs b/Assets/PerfectWorld/Scripts/Skills/skill88.cs index 8fae35c5f4..ddd4cd2814 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill88.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill88.cs @@ -127,16 +127,16 @@ namespace BrewMonster ~Skill88Stub() { } - public float GetMpcost(Skill skill) => (float)(-6 + 15 * skill.GetLevel()); - public int GetExecutetime(Skill skill) => 1000; - public int GetCoolingtime(Skill skill) => 3000; + public override float GetMpcost(Skill skill) => (float)(-6 + 15 * skill.GetLevel()); + public override int GetExecutetime(Skill skill) => 1000; + public override int GetCoolingtime(Skill skill) => 3000; public float GetRadius(Skill skill) => 0f; public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => (float)(19.5 + 0.9 * skill.GetLevel()); - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => (float)(19.5 + 0.9 * skill.GetLevel()); + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) diff --git a/Assets/PerfectWorld/Scripts/Skills/skill89.cs b/Assets/PerfectWorld/Scripts/Skills/skill89.cs index 6b91169e27..f358353ecb 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill89.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill89.cs @@ -88,16 +88,16 @@ namespace BrewMonster ~Skill89Stub() { } - public float GetMpcost(Skill skill) => 100f; - public int GetExecutetime(Skill skill) => 0; - public int GetCoolingtime(Skill skill) => 3000; + public override float GetMpcost(Skill skill) => 100f; + public override int GetExecutetime(Skill skill) => 0; + public override int GetCoolingtime(Skill skill) => 3000; public float GetRadius(Skill skill) => 0f; public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => 0f; - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => 0f; + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) diff --git a/Assets/PerfectWorld/Scripts/Skills/skill896.cs b/Assets/PerfectWorld/Scripts/Skills/skill896.cs index f0923ebce7..cd69542989 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill896.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill896.cs @@ -94,17 +94,17 @@ namespace BrewMonster ~Skill896Stub() { } - public float GetMpcost(Skill skill) => 200f; - public int GetExecutetime(Skill skill) => 0; - public int GetCoolingtime(Skill skill) => 300000; + public override float GetMpcost(Skill skill) => 200f; + public override int GetExecutetime(Skill skill) => 0; + public override int GetCoolingtime(Skill skill) => 300000; public float GetRadius(Skill skill) => 0f; public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => 0f; - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => 0f; + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) diff --git a/Assets/PerfectWorld/Scripts/Skills/skill897.cs b/Assets/PerfectWorld/Scripts/Skills/skill897.cs index 0f890e5de6..4c2d1b9ae8 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill897.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill897.cs @@ -124,17 +124,17 @@ namespace BrewMonster ~Skill897Stub() { } - public float GetMpcost(Skill skill) => 200f; - public int GetExecutetime(Skill skill) => 1500; - public int GetCoolingtime(Skill skill) => 120000; + public override float GetMpcost(Skill skill) => 200f; + public override int GetExecutetime(Skill skill) => 1500; + public override int GetCoolingtime(Skill skill) => 120000; public float GetRadius(Skill skill) => 15f; public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => 12f; - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => 12f; + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) diff --git a/Assets/PerfectWorld/Scripts/Skills/skill898.cs b/Assets/PerfectWorld/Scripts/Skills/skill898.cs index 68b6166261..03166af860 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill898.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill898.cs @@ -134,17 +134,17 @@ namespace BrewMonster ~Skill898Stub() { } - public float GetMpcost(Skill skill) => 200f; - public int GetExecutetime(Skill skill) => 1700; - public int GetCoolingtime(Skill skill) => 30000; + public override float GetMpcost(Skill skill) => 200f; + public override int GetExecutetime(Skill skill) => 1700; + public override int GetCoolingtime(Skill skill) => 30000; public float GetRadius(Skill skill) => 0f; public float GetAttackdistance(Skill skill) => (float)(skill.GetPlayer().GetRange() + 3 + 0.3 * skill.GetLevel()); public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => 18f; - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => 18f; + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) diff --git a/Assets/PerfectWorld/Scripts/Skills/skill899.cs b/Assets/PerfectWorld/Scripts/Skills/skill899.cs index ee6eb080de..e8ec35c665 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill899.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill899.cs @@ -126,17 +126,17 @@ namespace BrewMonster ~Skill899Stub() { } - public float GetMpcost(Skill skill) => 500f; - public int GetExecutetime(Skill skill) => 1500; - public int GetCoolingtime(Skill skill) => 120000; + public override float GetMpcost(Skill skill) => 500f; + public override int GetExecutetime(Skill skill) => 1500; + public override int GetCoolingtime(Skill skill) => 120000; public float GetRadius(Skill skill) => 12f; public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 *(60 + 2.5 * skill.GetLevel())); - public float GetPraydistance(Skill skill) => 5f; - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => 5f; + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) diff --git a/Assets/PerfectWorld/Scripts/Skills/skill9.cs b/Assets/PerfectWorld/Scripts/Skills/skill9.cs index 63da17c8f6..bf45e4d398 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill9.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill9.cs @@ -56,7 +56,6 @@ namespace BrewMonster dobless = 0; commoncooldown = 0; commoncooldowntime = 0; - effect = ""; range = new Range(); range.type = 0; pre_skills = new Dictionary(); @@ -66,16 +65,16 @@ namespace BrewMonster ~Skill9Stub() { } - public float GetMpcost(Skill skill) => 0f; - public int GetExecutetime(Skill skill) => 0; - public int GetCoolingtime(Skill skill) => 0; + public override float GetMpcost(Skill skill) => 0f; + public override int GetExecutetime(Skill skill) => 0; + public override int GetCoolingtime(Skill skill) => 0; public float GetRadius(Skill skill) => 0f; public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => 0f; - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => 0f; + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) @@ -100,28 +99,3 @@ namespace BrewMonster } - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/Assets/PerfectWorld/Scripts/Skills/skill90.cs b/Assets/PerfectWorld/Scripts/Skills/skill90.cs index 12fe2f12b7..b072de8295 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill90.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill90.cs @@ -124,16 +124,16 @@ namespace BrewMonster ~Skill90Stub() { } - public float GetMpcost(Skill skill) => (float)(142.5 + 37.5 * skill.GetLevel()); - public int GetExecutetime(Skill skill) => 1200; - public int GetCoolingtime(Skill skill) => 1000; + public override float GetMpcost(Skill skill) => (float)(142.5 + 37.5 * skill.GetLevel()); + public override int GetExecutetime(Skill skill) => 1200; + public override int GetCoolingtime(Skill skill) => 1000; public float GetRadius(Skill skill) => 0f; public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => (float)(19.5 + 0.9 * skill.GetLevel()); - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => (float)(19.5 + 0.9 * skill.GetLevel()); + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) diff --git a/Assets/PerfectWorld/Scripts/Skills/skill900.cs b/Assets/PerfectWorld/Scripts/Skills/skill900.cs index 0f11be0a9c..efe9edbefa 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill900.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill900.cs @@ -128,17 +128,17 @@ namespace BrewMonster ~Skill900Stub() { } - public float GetMpcost(Skill skill) => 400f; - public int GetExecutetime(Skill skill) => 1800; - public int GetCoolingtime(Skill skill) => 600000; + public override float GetMpcost(Skill skill) => 400f; + public override int GetExecutetime(Skill skill) => 1800; + public override int GetCoolingtime(Skill skill) => 600000; public float GetRadius(Skill skill) => 16f; public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => 0f; - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => 0f; + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) diff --git a/Assets/PerfectWorld/Scripts/Skills/skill901.cs b/Assets/PerfectWorld/Scripts/Skills/skill901.cs index d2014f1ddc..e1006b43ec 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill901.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill901.cs @@ -123,17 +123,17 @@ namespace BrewMonster ~Skill901Stub() { } - public float GetMpcost(Skill skill) => 1000f; - public int GetExecutetime(Skill skill) => 1000; - public int GetCoolingtime(Skill skill) => 300000; + public override float GetMpcost(Skill skill) => 1000f; + public override int GetExecutetime(Skill skill) => 1000; + public override int GetCoolingtime(Skill skill) => 300000; public float GetRadius(Skill skill) => 0f; public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => 0f; - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => 0f; + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_SERVER public int GetEnmity(Skill skill) => 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill902.cs b/Assets/PerfectWorld/Scripts/Skills/skill902.cs index c5b63f980d..b28c880491 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill902.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill902.cs @@ -127,17 +127,17 @@ namespace BrewMonster ~Skill902Stub() { } - public float GetMpcost(Skill skill) => 600f; - public int GetExecutetime(Skill skill) => 1000; - public int GetCoolingtime(Skill skill) => 1000; + public override float GetMpcost(Skill skill) => 600f; + public override int GetExecutetime(Skill skill) => 1000; + public override int GetCoolingtime(Skill skill) => 1000; public float GetRadius(Skill skill) => 0f; public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => 27f; - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => 27f; + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) diff --git a/Assets/PerfectWorld/Scripts/Skills/skill903.cs b/Assets/PerfectWorld/Scripts/Skills/skill903.cs index 6aeeff974a..9875a9471b 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill903.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill903.cs @@ -88,17 +88,17 @@ namespace BrewMonster ~Skill903Stub() { } - public float GetMpcost(Skill skill) => 600f; - public int GetExecutetime(Skill skill) => 0; - public int GetCoolingtime(Skill skill) => 120000; + public override float GetMpcost(Skill skill) => 600f; + public override int GetExecutetime(Skill skill) => 0; + public override int GetCoolingtime(Skill skill) => 120000; public float GetRadius(Skill skill) => 0f; public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => 20f; - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => 20f; + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) diff --git a/Assets/PerfectWorld/Scripts/Skills/skill904.cs b/Assets/PerfectWorld/Scripts/Skills/skill904.cs index 2c41416dfb..6c0cbe5232 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill904.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill904.cs @@ -88,17 +88,17 @@ namespace BrewMonster ~Skill904Stub() { } - public float GetMpcost(Skill skill) => 200f; - public int GetExecutetime(Skill skill) => 0; - public int GetCoolingtime(Skill skill) => 30000; + public override float GetMpcost(Skill skill) => 200f; + public override int GetExecutetime(Skill skill) => 0; + public override int GetCoolingtime(Skill skill) => 30000; public float GetRadius(Skill skill) => 0f; public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => 30f; - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => 30f; + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_SERVER public int GetEnmity(Skill skill) => 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill905.cs b/Assets/PerfectWorld/Scripts/Skills/skill905.cs index 75c623eb08..737fbfa282 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill905.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill905.cs @@ -126,17 +126,17 @@ namespace BrewMonster ~Skill905Stub() { } - public float GetMpcost(Skill skill) => 1000f; - public int GetExecutetime(Skill skill) => 1000; - public int GetCoolingtime(Skill skill) => 300000; + public override float GetMpcost(Skill skill) => 1000f; + public override int GetExecutetime(Skill skill) => 1000; + public override int GetCoolingtime(Skill skill) => 300000; public float GetRadius(Skill skill) => (float)(8 + 0.4 * skill.GetLevel()); public float GetAttackdistance(Skill skill) => (float)(4 + 0.3 * skill.GetLevel()); public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => 30f; - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => 30f; + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) diff --git a/Assets/PerfectWorld/Scripts/Skills/skill91.cs b/Assets/PerfectWorld/Scripts/Skills/skill91.cs index fdc7474347..755e0801ba 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill91.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill91.cs @@ -124,16 +124,16 @@ namespace BrewMonster ~Skill91Stub() { } - public float GetMpcost(Skill skill) => (float)(200 + 25 * skill.GetLevel()); - public int GetExecutetime(Skill skill) => 1000; - public int GetCoolingtime(Skill skill) => 3000; + public override float GetMpcost(Skill skill) => (float)(200 + 25 * skill.GetLevel()); + public override int GetExecutetime(Skill skill) => 1000; + public override int GetCoolingtime(Skill skill) => 3000; public float GetRadius(Skill skill) => 0f; public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => (float)(19.5 + 0.9 * skill.GetLevel()); - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => (float)(19.5 + 0.9 * skill.GetLevel()); + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) diff --git a/Assets/PerfectWorld/Scripts/Skills/skill92.cs b/Assets/PerfectWorld/Scripts/Skills/skill92.cs index fa4e511784..fdd1cdb682 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill92.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill92.cs @@ -127,16 +127,16 @@ namespace BrewMonster ~Skill92Stub() { } - public float GetMpcost(Skill skill) => (float)(202.5 + 18 * skill.GetLevel()); - public int GetExecutetime(Skill skill) => 1800; - public int GetCoolingtime(Skill skill) => 15000; + public override float GetMpcost(Skill skill) => (float)(202.5 + 18 * skill.GetLevel()); + public override int GetExecutetime(Skill skill) => 1800; + public override int GetCoolingtime(Skill skill) => 15000; public float GetRadius(Skill skill) => 0f; public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => (float)(19.5 + 0.9 * skill.GetLevel()); - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => (float)(19.5 + 0.9 * skill.GetLevel()); + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) diff --git a/Assets/PerfectWorld/Scripts/Skills/skill923.cs b/Assets/PerfectWorld/Scripts/Skills/skill923.cs index 463b2cb3bc..67f8f4533f 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill923.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill923.cs @@ -126,17 +126,17 @@ namespace BrewMonster ~Skill923Stub() { } - public float GetMpcost(Skill skill) => 500f; - public int GetExecutetime(Skill skill) => 1500; - public int GetCoolingtime(Skill skill) => 120000; + public override float GetMpcost(Skill skill) => 500f; + public override int GetExecutetime(Skill skill) => 1500; + public override int GetCoolingtime(Skill skill) => 120000; public float GetRadius(Skill skill) => 12f; public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 *(60 + 2.5 * skill.GetLevel())); - public float GetPraydistance(Skill skill) => 5f; - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => 5f; + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) diff --git a/Assets/PerfectWorld/Scripts/Skills/skill924.cs b/Assets/PerfectWorld/Scripts/Skills/skill924.cs index 7efd5787d9..76e91422ee 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill924.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill924.cs @@ -128,17 +128,17 @@ namespace BrewMonster ~Skill924Stub() { } - public float GetMpcost(Skill skill) => 400f; - public int GetExecutetime(Skill skill) => 1800; - public int GetCoolingtime(Skill skill) => 600000; + public override float GetMpcost(Skill skill) => 400f; + public override int GetExecutetime(Skill skill) => 1800; + public override int GetCoolingtime(Skill skill) => 600000; public float GetRadius(Skill skill) => 16f; public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => 0f; - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => 0f; + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) diff --git a/Assets/PerfectWorld/Scripts/Skills/skill925.cs b/Assets/PerfectWorld/Scripts/Skills/skill925.cs index f3b035c35e..d520526d59 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill925.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill925.cs @@ -123,17 +123,17 @@ namespace BrewMonster ~Skill925Stub() { } - public float GetMpcost(Skill skill) => 1000f; - public int GetExecutetime(Skill skill) => 1000; - public int GetCoolingtime(Skill skill) => 300000; + public override float GetMpcost(Skill skill) => 1000f; + public override int GetExecutetime(Skill skill) => 1000; + public override int GetCoolingtime(Skill skill) => 300000; public float GetRadius(Skill skill) => 0f; public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => 0f; - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => 0f; + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_SERVER public int GetEnmity(Skill skill) => 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill926.cs b/Assets/PerfectWorld/Scripts/Skills/skill926.cs index bdc4a50dd9..578ee9d726 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill926.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill926.cs @@ -126,17 +126,17 @@ namespace BrewMonster ~Skill926Stub() { } - public float GetMpcost(Skill skill) => 1000f; - public int GetExecutetime(Skill skill) => 1000; - public int GetCoolingtime(Skill skill) => 300000; + public override float GetMpcost(Skill skill) => 1000f; + public override int GetExecutetime(Skill skill) => 1000; + public override int GetCoolingtime(Skill skill) => 300000; public float GetRadius(Skill skill) => (float)(8 + 0.4 * skill.GetLevel()); public float GetAttackdistance(Skill skill) => (float)(4 + 0.3 * skill.GetLevel()); public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => 30f; - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => 30f; + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredItem(Skill skill) => RequiredItemArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) diff --git a/Assets/PerfectWorld/Scripts/Skills/skill93.cs b/Assets/PerfectWorld/Scripts/Skills/skill93.cs index 0ed7ffa416..4bff32e88d 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill93.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill93.cs @@ -127,16 +127,16 @@ namespace BrewMonster ~Skill93Stub() { } - public float GetMpcost(Skill skill) => (float)(336 + 18 * skill.GetLevel()); - public int GetExecutetime(Skill skill) => 1600; - public int GetCoolingtime(Skill skill) => 30000; + public override float GetMpcost(Skill skill) => (float)(336 + 18 * skill.GetLevel()); + public override int GetExecutetime(Skill skill) => 1600; + public override int GetCoolingtime(Skill skill) => 30000; public float GetRadius(Skill skill) => (float)(8 + 0.4 * skill.GetLevel()); public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => (float)(19.5 + 0.9 * skill.GetLevel()); - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => (float)(19.5 + 0.9 * skill.GetLevel()); + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) diff --git a/Assets/PerfectWorld/Scripts/Skills/skill94.cs b/Assets/PerfectWorld/Scripts/Skills/skill94.cs index 5447f92c64..600cc9fc88 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill94.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill94.cs @@ -138,13 +138,13 @@ namespace BrewMonster ~Skill94Stub() { } - public float GetMpcost(Skill skill) => (float)(20 + 3 * skill.GetLevel()); - public int GetExecutetime(Skill skill) => 1500; - public int GetCoolingtime(Skill skill) => 5000; + public override float GetMpcost(Skill skill) => (float)(20 + 3 * skill.GetLevel()); + public override int GetExecutetime(Skill skill) => 1500; + public override int GetCoolingtime(Skill skill) => 5000; public float GetRadius(Skill skill) => (float)(7 + 0.3 * skill.GetLevel()); public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => (float)(18 + 0.5 * skill.GetLevel()); + public override float GetPraydistance(Skill skill) => (float)(18 + 0.5 * skill.GetLevel()); #if SKILL_SERVER public int GetEnmity(Skill skill) => 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill95.cs b/Assets/PerfectWorld/Scripts/Skills/skill95.cs index adb798991e..7588a99437 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill95.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill95.cs @@ -120,13 +120,13 @@ namespace BrewMonster ~Skill95Stub() { } - public float GetMpcost(Skill skill) => (float)(50 + 3 * skill.GetLevel()); - public int GetExecutetime(Skill skill) => 2000; - public int GetCoolingtime(Skill skill) => 10000; + public override float GetMpcost(Skill skill) => (float)(50 + 3 * skill.GetLevel()); + public override int GetExecutetime(Skill skill) => 2000; + public override int GetCoolingtime(Skill skill) => 10000; public float GetRadius(Skill skill) => (float)(9 + 0.4 * skill.GetLevel()); public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => (float)(18 + 0.5 * skill.GetLevel()); + public override float GetPraydistance(Skill skill) => (float)(18 + 0.5 * skill.GetLevel()); #if SKILL_SERVER public int GetEnmity(Skill skill) => 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill96.cs b/Assets/PerfectWorld/Scripts/Skills/skill96.cs index f428adf4e9..a5f17ef7a5 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill96.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill96.cs @@ -124,16 +124,16 @@ namespace BrewMonster ~Skill96Stub() { } - public float GetMpcost(Skill skill) => (float)(12 + 15 * skill.GetLevel()); - public int GetExecutetime(Skill skill) => 1200; - public int GetCoolingtime(Skill skill) => 3000; + public override float GetMpcost(Skill skill) => (float)(12 + 15 * skill.GetLevel()); + public override int GetExecutetime(Skill skill) => 1200; + public override int GetCoolingtime(Skill skill) => 3000; public float GetRadius(Skill skill) => 0f; public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => 0f; - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => 0f; + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) diff --git a/Assets/PerfectWorld/Scripts/Skills/skill97.cs b/Assets/PerfectWorld/Scripts/Skills/skill97.cs index 109b944508..6ef11481f5 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill97.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill97.cs @@ -127,16 +127,16 @@ namespace BrewMonster ~Skill97Stub() { } - public float GetMpcost(Skill skill) => (float)(4.2 + 21 * skill.GetLevel()); - public int GetExecutetime(Skill skill) => 1400; - public int GetCoolingtime(Skill skill) => 3000; + public override float GetMpcost(Skill skill) => (float)(4.2 + 21 * skill.GetLevel()); + public override int GetExecutetime(Skill skill) => 1400; + public override int GetCoolingtime(Skill skill) => 3000; public float GetRadius(Skill skill) => 0f; public float GetAttackdistance(Skill skill) => 0f; public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => (float)(19.5 + 0.9 * skill.GetLevel()); - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => (float)(19.5 + 0.9 * skill.GetLevel()); + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) diff --git a/Assets/PerfectWorld/Scripts/Skills/skill98.cs b/Assets/PerfectWorld/Scripts/Skills/skill98.cs index 019799d8cc..a3f61511f2 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill98.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill98.cs @@ -127,16 +127,16 @@ namespace BrewMonster ~Skill98Stub() { } - public float GetMpcost(Skill skill) => (float)(157.5 + 18 * skill.GetLevel()); - public int GetExecutetime(Skill skill) => 1500; - public int GetCoolingtime(Skill skill) => 5000; + public override float GetMpcost(Skill skill) => (float)(157.5 + 18 * skill.GetLevel()); + public override int GetExecutetime(Skill skill) => 1500; + public override int GetCoolingtime(Skill skill) => 5000; public float GetRadius(Skill skill) => 0f; public float GetAttackdistance(Skill skill) => (float)(15 + 0.4 * skill.GetLevel()); public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => (float)(19.5 + 0.9 * skill.GetLevel()); - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => (float)(19.5 + 0.9 * skill.GetLevel()); + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) diff --git a/Assets/PerfectWorld/Scripts/Skills/skill99.cs b/Assets/PerfectWorld/Scripts/Skills/skill99.cs index 832cf457c5..db67b6e087 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill99.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill99.cs @@ -126,16 +126,16 @@ namespace BrewMonster ~Skill99Stub() { } - public float GetMpcost(Skill skill) => (float)(336 + 18 * skill.GetLevel()); - public int GetExecutetime(Skill skill) => 1400; - public int GetCoolingtime(Skill skill) => 30000; + public override float GetMpcost(Skill skill) => (float)(336 + 18 * skill.GetLevel()); + public override int GetExecutetime(Skill skill) => 1400; + public override int GetCoolingtime(Skill skill) => 30000; public float GetRadius(Skill skill) => (float)(8 + 0.4 * skill.GetLevel()); public float GetAttackdistance(Skill skill) => (float)(4 + 0.4 * skill.GetLevel()); public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public float GetPraydistance(Skill skill) => (float)(19.5 + 0.9 * skill.GetLevel()); - public int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; + public override float GetPraydistance(Skill skill) => (float)(19.5 + 0.9 * skill.GetLevel()); + public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; + public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; + public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; #if SKILL_CLIENT public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) diff --git a/Assets/PerfectWorld/Scripts/UI/Dialogs/CDlgSkillSubList.cs b/Assets/PerfectWorld/Scripts/UI/Dialogs/CDlgSkillSubList.cs index 88e7ee2c7a..7ecbf9ea50 100644 --- a/Assets/PerfectWorld/Scripts/UI/Dialogs/CDlgSkillSubList.cs +++ b/Assets/PerfectWorld/Scripts/UI/Dialogs/CDlgSkillSubList.cs @@ -216,7 +216,7 @@ namespace BrewMonster.UI return; } - CDlgSkillSubListItem subListItem = pSub.GetComponent(); + CDlgSkillSubListItem subListItem = (CDlgSkillSubListItem)pSub.GetSubDialog(); subListItem?.UpdateSkill(skillID); if (GetSelectedSkillID() == skillID) @@ -253,7 +253,11 @@ namespace BrewMonster.UI if (m_skillSubCount >= m_skillSubDialogs.Count) { AUISubDialog pSubSkill = Instantiate(m_pSubSkill, m_contentRoot); - pSubSkill.SetName($"{m_pSubSkill.GetName()}{m_skillSubDialogs.Count}"); + //CDlgSkillSubListItem pDlg = Instantiate(cDlgSkillSubListItem, cDlgSkillSubListItemRoot); + string dlgName = $"{m_pSubSkill.GetName()}{m_skillSubDialogs.Count}"; + pSubSkill.SetName(dlgName); + //pSubSkill.SetDialog(pDlg); + m_skillSubDialogs.Add(pSubSkill); } diff --git a/Assets/PerfectWorld/Scripts/UI/GamePlay/SkillUI/AUISubDialog.cs b/Assets/PerfectWorld/Scripts/UI/GamePlay/SkillUI/AUISubDialog.cs index 9e10b27db7..71b7311adc 100644 --- a/Assets/PerfectWorld/Scripts/UI/GamePlay/SkillUI/AUISubDialog.cs +++ b/Assets/PerfectWorld/Scripts/UI/GamePlay/SkillUI/AUISubDialog.cs @@ -7,7 +7,7 @@ namespace BrewMonster [DisallowMultipleComponent] public class AUISubDialog : MonoBehaviour { - [SerializeField] private AUIDialog m_subDialog; + [SerializeField] private CDlgSkillSubListItem m_subDialog; [SerializeField] private RectTransform m_rectTransform; [SerializeField] private TextMeshProUGUI levelName; [SerializeField] private TextMeshProUGUI label; @@ -22,16 +22,16 @@ namespace BrewMonster } if (m_subDialog == null) { - m_subDialog = GetComponent(); + m_subDialog = GetComponent(); } } - public void SetDialog(AUIDialog dialog) + public void SetDialog(CDlgSkillSubListItem dialog) { m_subDialog = dialog; } - public AUIDialog GetSubDialog() + public CDlgSkillSubListItem GetSubDialog() { return m_subDialog; } diff --git a/Assets/PerfectWorld/Scripts/skill2.cs b/Assets/PerfectWorld/Scripts/skill2.cs deleted file mode 100644 index 3fa0993399..0000000000 --- a/Assets/PerfectWorld/Scripts/skill2.cs +++ /dev/null @@ -1,171 +0,0 @@ -#define SKILL_CLIENT -using BrewMonster.Scripts.Skills; -using System.Collections.Generic; -using System.Text; -using UnityEngine; -using static BrewMonster.PET_EVOLVE_CONFIG; - -namespace BrewMonster -{ - -#if SKILL_SERVER - public class Skill2 : Skill - { - public const int SKILL_ID = 2; - - public Skill2() : base(SKILL_ID) - { - } - } -#endif - - public class Skill2Stub : SkillStub - { - private static readonly int[] RequiredLevelArray = { 3, 8, 13, 18, 23, 28, 33, 38, 43, 48 }; - private static readonly int[] RequiredSpArray = { 100, 800, 2100, 4100, 7000, 10900, 16100, 23000, 32000, 44100 }; - private static readonly int[] RequiredMoneyArray = { 10, 90, 220, 400, 630, 1000, 1450, 1900, 2380, 2880 }; - - -#if SKILL_SERVER - public class State1 : SkillStub.State - { - public int GetTime(Skill skill) => 200; - public bool Quit(Skill skill) => false; - public bool Loop(Skill skill) => false; - public bool Bypass(Skill skill) => false; - public void Calculate(Skill skill) - { - skill.GetPlayer().SetDecmp(0.2f *(-2.2f + 5.6f * skill.GetLevel())); - skill.GetPlayer().SetPray(1); - } - public bool Interrupt(Skill skill) => false; - public bool Cancel(Skill skill) => true; - public bool Skip(Skill skill) => false; - } -#endif - -#if SKILL_SERVER - public class State2 : SkillStub.State - { - public int GetTime(Skill skill) => 700; - public bool Quit(Skill skill) => false; - public bool Loop(Skill skill) => false; - public bool Bypass(Skill skill) => false; - public void Calculate(Skill skill) - { - skill.GetPlayer().SetDecmp(0.8f *(-2.2f + 5.6f * skill.GetLevel())); - skill.SetPlus(0); - skill.SetRatio(0); - skill.SetDamage(skill.GetAttack()); - skill.GetPlayer().SetPerform(1); - } - public bool Interrupt(Skill skill) => false; - public bool Cancel(Skill skill) => false; - public bool Skip(Skill skill) => false; - } -#endif - -#if SKILL_SERVER - public class State3 : SkillStub.State - { - public int GetTime(Skill skill) => 0; - public bool Quit(Skill skill) => false; - public bool Loop(Skill skill) => false; - public bool Bypass(Skill skill) => false; - public void Calculate(Skill skill) - { - } - public bool Interrupt(Skill skill) => false; - public bool Cancel(Skill skill) => false; - public bool Skip(Skill skill) => false; - } -#endif - - public Skill2Stub() : base(2) - { - cls = 0; - name = "寸力"; - nativename = "寸力"; - icon = "寸力.dds"; - max_level = 10; - type = 1; - apcost = 0; - arrowcost = 0; - apgain = 5; - attr = 1; - rank = 0; - eventflag = 0; - posdouble = 0; - clslimit = 0; - time_type = 0; - showorder = 1102; - allow_land = true; - allow_air = true; - allow_water = true; - allow_ride = false; - auto_attack = true; - long_range = 0; - restrict_corpse = 0; - allow_forms = 1; - effect = "寸力.sgc"; - doenchant = 1; - dobless = 0; - commoncooldown = 0; - commoncooldowntime = 0; - restrict_weapons.Add(0); - restrict_weapons.Add(1); - restrict_weapons.Add(182); - restrict_weapons.Add(9); - restrict_weapons.Add(5); - restrict_weapons.Add(292); - range = new Range(); - range.type = 0; - pre_skills = new Dictionary(); - pre_skills.Add(1, 1); -#if SKILL_SERVER - statestub.Add(new State1()); - statestub.Add(new State2()); - statestub.Add(new State3()); -#endif - } - - ~Skill2Stub() { } - - public override float GetMpcost(Skill skill) => (float)(-2.2 + 5.6 * skill.GetLevel()); - public override int GetExecutetime(Skill skill) => 700; - public override int GetCoolingtime(Skill skill) => 8000; - public float GetRadius(Skill skill) => 0f; - public float GetAttackdistance(Skill skill) => 0f; - public float GetAngle(Skill skill) => (float)(1 - 0.0111111 * 0); - public override float GetPraydistance(Skill skill) => (float)(skill.GetPlayer().GetRange()); - public override int GetRequiredLevel(Skill skill) => RequiredLevelArray[skill.GetLevel() - 1]; - public override int GetRequiredSp(Skill skill) => RequiredSpArray[skill.GetLevel() - 1]; - public override int GetRequiredMoney(Skill skill) => RequiredMoneyArray[skill.GetLevel() - 1]; - -#if SKILL_CLIENT - public int GetIntroduction(Skill skill, StringBuilder buffer, int length, string format) - { - string result = string.Format(format, - skill.GetLevel(), - -2.2 + 5.6 * skill.GetLevel(), - 5.9 * skill.GetLevel() * skill.GetLevel() + 126.7 * skill.GetLevel() + 40.5); - if (result.Length < length) - { - buffer.Append(result); - return result.Length; - } - return 0; - } -#endif - -#if SKILL_SERVER - public int GetEnmity(Skill skill) => 0; - public bool StateAttack(Skill skill) => true; - public bool TakeEffect(Skill skill) => true; - public float GetEffectdistance(Skill skill) => 11.7f; - public int GetAttackspeed(Skill skill) => 3; - public float GetHitrate(Skill skill) => 1.2f + 0.05f * skill.GetLevel(); -#endif - } -} - diff --git a/Assets/Prefabs/BoostrapForTest.prefab b/Assets/Prefabs/BoostrapForTest.prefab index a200cbab00..7bfd004f27 100644 --- a/Assets/Prefabs/BoostrapForTest.prefab +++ b/Assets/Prefabs/BoostrapForTest.prefab @@ -202,7 +202,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 11414302, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3} propertyPath: m_Value - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 11490438, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3} propertyPath: m_IgnoreReversedGraphics @@ -210,7 +210,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 22400762, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3} propertyPath: m_AnchoredPosition.y - value: 0.000061035156 + value: -0.000061035156 objectReference: {fileID: 0} - target: {fileID: 22426080, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3} propertyPath: m_AnchorMax.x diff --git a/Assets/Prefabs/UI/SkillUI.prefab b/Assets/Prefabs/UI/SkillUI.prefab index f1042766fb..db7540b523 100644 --- a/Assets/Prefabs/UI/SkillUI.prefab +++ b/Assets/Prefabs/UI/SkillUI.prefab @@ -7867,9 +7867,9 @@ RectTransform: m_Children: [] m_Father: {fileID: 3016923604946316301} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 83.16, y: -48.51895} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 166.32, y: 97.0379} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &821733676846102905 @@ -9012,6 +9012,126 @@ MonoBehaviour: m_Spacing: {x: 10, y: 5} m_Constraint: 0 m_ConstraintCount: 2 +--- !u!1 &4086447501152143536 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 182876207066636261} + - component: {fileID: 1721371819749400968} + - component: {fileID: 965717648012013995} + - component: {fileID: 1740850918655432579} + m_Layer: 5 + m_Name: ButtonClose + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &182876207066636261 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4086447501152143536} + 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: 627631504828013321} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 1, y: 1} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: -283.59998, y: -228.4} + m_SizeDelta: {x: 82.401245, y: 82.401306} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &1721371819749400968 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4086447501152143536} + m_CullTransparentMesh: 1 +--- !u!114 &965717648012013995 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4086447501152143536} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: fb2f2f58be45f6e4890e85cc00b0bcc9, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!114 &1740850918655432579 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4086447501152143536} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_WrapAround: 0 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 965717648012013995} + m_OnClick: + m_PersistentCalls: + m_Calls: [] --- !u!1 &4149346552991504611 GameObject: m_ObjectHideFlags: 0 @@ -10151,9 +10271,9 @@ RectTransform: - {fileID: 3703262150164293383} m_Father: {fileID: 3016923604946316301} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 83.16, y: -292.4765} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 166.32, y: 130.2924} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &5150156580756960231 @@ -11400,9 +11520,9 @@ RectTransform: - {fileID: 131742873718785436} m_Father: {fileID: 3016923604946316301} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 83.16, y: -162.18411} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 166.32, y: 130.2924} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &5468634806808161123 @@ -13570,7 +13690,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &627631504828013321 RectTransform: m_ObjectHideFlags: 0 @@ -13589,6 +13709,7 @@ RectTransform: - {fileID: 6723345811351538777} - {fileID: 2387395177775218455} - {fileID: 4958559450723387948} + - {fileID: 182876207066636261} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} @@ -17557,7 +17678,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: -361.27, y: 365.44547} - m_SizeDelta: {x: 722.5344, y: 28} + m_SizeDelta: {x: 722.5344, y: 0} m_Pivot: {x: 0, y: 1} --- !u!222 &7853130943468561016 CanvasRenderer: diff --git a/Assets/Scenes/a61.unity b/Assets/Scenes/a61.unity index f92af2af40..a30fbb6772 100644 --- a/Assets/Scenes/a61.unity +++ b/Assets/Scenes/a61.unity @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4e48c9be3ea9d07ee5f5073f5d0759c66181647b3d57a2d2358cd50ae5502408 -size 200782987 +oid sha256:4e07d8bd1042cf37912023a990cfa999d63ac5606ba77995ae43b7342eaa9912 +size 200776882 From d31149e69c7b5a73bd3d14d642108b3a0440b1d9 Mon Sep 17 00:00:00 2001 From: Le Duc Anh Date: Thu, 8 Jan 2026 15:09:53 +0700 Subject: [PATCH 03/22] update water shader --- .../Art/Models/maps/a61/waters/14.prefab | 2 +- .../Art/Models/maps/a61/waters/24.prefab | 2 +- .../Art/Models/maps/a61/waters/2663.prefab | 2 +- .../Art/Models/maps/a61/waters/47.prefab | 2 +- .../Art/Models/maps/a61/waters/4737.prefab | 2 +- .../Art/Models/maps/a61/waters/4821.prefab | 2 +- .../Art/Models/maps/a61/waters/4823.prefab | 2 +- .../Art/Models/maps/a61/waters/4838.prefab | 2 +- .../Art/Models/maps/a61/waters/4853.prefab | 2 +- .../Art/Models/maps/a61/waters/4855.prefab | 2 +- .../Art/Models/maps/a61/waters/49.prefab | 2 +- .../Art/Models/maps/a61/waters/65.prefab | 2 +- .../Art/Shaders/UnlitVertexColorUnlit.shader | 53 ++++ Assets/water.meta | 8 + Assets/water/ClearWaterShader.shader | 252 ++++++++++++++++++ Assets/water/ClearWaterShader.shader.meta | 9 + Assets/water/Water.mat | 71 +++++ Assets/water/Water.mat.meta | 8 + Assets/water/caust26.tga | Bin 0 -> 16428 bytes Assets/water/caust26.tga.meta | 117 ++++++++ Assets/water/water_normal00.tga | Bin 0 -> 262694 bytes Assets/water/water_normal00.tga.meta | 117 ++++++++ ProjectSettings/ProjectSettings.asset | 14 +- ProjectSettings/QualitySettings.asset | 5 +- 24 files changed, 662 insertions(+), 16 deletions(-) create mode 100644 Assets/water.meta create mode 100644 Assets/water/ClearWaterShader.shader create mode 100644 Assets/water/ClearWaterShader.shader.meta create mode 100644 Assets/water/Water.mat create mode 100644 Assets/water/Water.mat.meta create mode 100644 Assets/water/caust26.tga create mode 100644 Assets/water/caust26.tga.meta create mode 100644 Assets/water/water_normal00.tga create mode 100644 Assets/water/water_normal00.tga.meta diff --git a/Assets/ModelRenderer/Art/Models/maps/a61/waters/14.prefab b/Assets/ModelRenderer/Art/Models/maps/a61/waters/14.prefab index 35ada92ba7..0d76b00cdf 100644 --- a/Assets/ModelRenderer/Art/Models/maps/a61/waters/14.prefab +++ b/Assets/ModelRenderer/Art/Models/maps/a61/waters/14.prefab @@ -64,7 +64,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: 1ac436974d9a3a14ab8d8ec85fc8f2df, type: 2} + - {fileID: 2100000, guid: 1b9823b5bf0301f4581c148b6a2645f4, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 diff --git a/Assets/ModelRenderer/Art/Models/maps/a61/waters/24.prefab b/Assets/ModelRenderer/Art/Models/maps/a61/waters/24.prefab index 6ad7402f85..44c75b9261 100644 --- a/Assets/ModelRenderer/Art/Models/maps/a61/waters/24.prefab +++ b/Assets/ModelRenderer/Art/Models/maps/a61/waters/24.prefab @@ -64,7 +64,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: 1ac436974d9a3a14ab8d8ec85fc8f2df, type: 2} + - {fileID: 2100000, guid: 1b9823b5bf0301f4581c148b6a2645f4, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 diff --git a/Assets/ModelRenderer/Art/Models/maps/a61/waters/2663.prefab b/Assets/ModelRenderer/Art/Models/maps/a61/waters/2663.prefab index a45d62b711..a8eb30bad5 100644 --- a/Assets/ModelRenderer/Art/Models/maps/a61/waters/2663.prefab +++ b/Assets/ModelRenderer/Art/Models/maps/a61/waters/2663.prefab @@ -65,7 +65,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: 1ac436974d9a3a14ab8d8ec85fc8f2df, type: 2} + - {fileID: 2100000, guid: 1b9823b5bf0301f4581c148b6a2645f4, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 diff --git a/Assets/ModelRenderer/Art/Models/maps/a61/waters/47.prefab b/Assets/ModelRenderer/Art/Models/maps/a61/waters/47.prefab index f8fd0caf62..68bb638f1e 100644 --- a/Assets/ModelRenderer/Art/Models/maps/a61/waters/47.prefab +++ b/Assets/ModelRenderer/Art/Models/maps/a61/waters/47.prefab @@ -64,7 +64,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: 1ac436974d9a3a14ab8d8ec85fc8f2df, type: 2} + - {fileID: 2100000, guid: 1b9823b5bf0301f4581c148b6a2645f4, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 diff --git a/Assets/ModelRenderer/Art/Models/maps/a61/waters/4737.prefab b/Assets/ModelRenderer/Art/Models/maps/a61/waters/4737.prefab index e210045af5..715dce4caf 100644 --- a/Assets/ModelRenderer/Art/Models/maps/a61/waters/4737.prefab +++ b/Assets/ModelRenderer/Art/Models/maps/a61/waters/4737.prefab @@ -97,7 +97,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: 1ac436974d9a3a14ab8d8ec85fc8f2df, type: 2} + - {fileID: 2100000, guid: 1b9823b5bf0301f4581c148b6a2645f4, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 diff --git a/Assets/ModelRenderer/Art/Models/maps/a61/waters/4821.prefab b/Assets/ModelRenderer/Art/Models/maps/a61/waters/4821.prefab index d188b88233..66685a29d8 100644 --- a/Assets/ModelRenderer/Art/Models/maps/a61/waters/4821.prefab +++ b/Assets/ModelRenderer/Art/Models/maps/a61/waters/4821.prefab @@ -96,7 +96,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: 1ac436974d9a3a14ab8d8ec85fc8f2df, type: 2} + - {fileID: 2100000, guid: 1b9823b5bf0301f4581c148b6a2645f4, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 diff --git a/Assets/ModelRenderer/Art/Models/maps/a61/waters/4823.prefab b/Assets/ModelRenderer/Art/Models/maps/a61/waters/4823.prefab index 6e9548321b..5f86df403a 100644 --- a/Assets/ModelRenderer/Art/Models/maps/a61/waters/4823.prefab +++ b/Assets/ModelRenderer/Art/Models/maps/a61/waters/4823.prefab @@ -96,7 +96,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: 1ac436974d9a3a14ab8d8ec85fc8f2df, type: 2} + - {fileID: 2100000, guid: 1b9823b5bf0301f4581c148b6a2645f4, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 diff --git a/Assets/ModelRenderer/Art/Models/maps/a61/waters/4838.prefab b/Assets/ModelRenderer/Art/Models/maps/a61/waters/4838.prefab index 1fdd7fd47a..208f1913b9 100644 --- a/Assets/ModelRenderer/Art/Models/maps/a61/waters/4838.prefab +++ b/Assets/ModelRenderer/Art/Models/maps/a61/waters/4838.prefab @@ -96,7 +96,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: 1ac436974d9a3a14ab8d8ec85fc8f2df, type: 2} + - {fileID: 2100000, guid: 1b9823b5bf0301f4581c148b6a2645f4, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 diff --git a/Assets/ModelRenderer/Art/Models/maps/a61/waters/4853.prefab b/Assets/ModelRenderer/Art/Models/maps/a61/waters/4853.prefab index e625bc5322..b472b5b0ed 100644 --- a/Assets/ModelRenderer/Art/Models/maps/a61/waters/4853.prefab +++ b/Assets/ModelRenderer/Art/Models/maps/a61/waters/4853.prefab @@ -64,7 +64,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: 1ac436974d9a3a14ab8d8ec85fc8f2df, type: 2} + - {fileID: 2100000, guid: 1b9823b5bf0301f4581c148b6a2645f4, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 diff --git a/Assets/ModelRenderer/Art/Models/maps/a61/waters/4855.prefab b/Assets/ModelRenderer/Art/Models/maps/a61/waters/4855.prefab index 0950e9f149..87c1c576a7 100644 --- a/Assets/ModelRenderer/Art/Models/maps/a61/waters/4855.prefab +++ b/Assets/ModelRenderer/Art/Models/maps/a61/waters/4855.prefab @@ -96,7 +96,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: 1ac436974d9a3a14ab8d8ec85fc8f2df, type: 2} + - {fileID: 2100000, guid: 1b9823b5bf0301f4581c148b6a2645f4, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 diff --git a/Assets/ModelRenderer/Art/Models/maps/a61/waters/49.prefab b/Assets/ModelRenderer/Art/Models/maps/a61/waters/49.prefab index 7c024bb128..8401bb7361 100644 --- a/Assets/ModelRenderer/Art/Models/maps/a61/waters/49.prefab +++ b/Assets/ModelRenderer/Art/Models/maps/a61/waters/49.prefab @@ -96,7 +96,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: 1ac436974d9a3a14ab8d8ec85fc8f2df, type: 2} + - {fileID: 2100000, guid: 1b9823b5bf0301f4581c148b6a2645f4, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 diff --git a/Assets/ModelRenderer/Art/Models/maps/a61/waters/65.prefab b/Assets/ModelRenderer/Art/Models/maps/a61/waters/65.prefab index f4f318bbb5..107b2e0469 100644 --- a/Assets/ModelRenderer/Art/Models/maps/a61/waters/65.prefab +++ b/Assets/ModelRenderer/Art/Models/maps/a61/waters/65.prefab @@ -64,7 +64,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: 1ac436974d9a3a14ab8d8ec85fc8f2df, type: 2} + - {fileID: 2100000, guid: 1b9823b5bf0301f4581c148b6a2645f4, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 diff --git a/Assets/ModelRenderer/Art/Shaders/UnlitVertexColorUnlit.shader b/Assets/ModelRenderer/Art/Shaders/UnlitVertexColorUnlit.shader index 8fcfa05a78..f58a736f83 100644 --- a/Assets/ModelRenderer/Art/Shaders/UnlitVertexColorUnlit.shader +++ b/Assets/ModelRenderer/Art/Shaders/UnlitVertexColorUnlit.shader @@ -230,6 +230,59 @@ Shader "BrewMonster/UnlitVertexColorUnlit" } ENDHLSL } + + Pass + { + Name "DepthNormals" + Tags { "LightMode" = "DepthNormals" } + + ZWrite On + Cull Back + + HLSLPROGRAM + #pragma vertex DepthNormalsVertex + #pragma fragment DepthNormalsFragment + + #include "Packages/com.unity.render-pipelines.universal/ShaderLibrary/Core.hlsl" + + struct Attributes + { + float4 position : POSITION; + float3 normal : NORMAL; + }; + + struct Varyings + { + float4 positionCS : SV_POSITION; + float3 normalWS : TEXCOORD0; + }; + + CBUFFER_START(UnityPerMaterial) + float4 _Texture_1_ST; + float4 _Texture_2_ST; + float4 _Texture_3_ST; + float4 _MaskTexture_ST; + half _Brightness; + CBUFFER_END + + Varyings DepthNormalsVertex(Attributes input) + { + Varyings output; + VertexPositionInputs positionInputs = GetVertexPositionInputs(input.position.xyz); + VertexNormalInputs normalInputs = GetVertexNormalInputs(input.normal); + + output.positionCS = positionInputs.positionCS; + output.normalWS = normalInputs.normalWS; + return output; + } + + half4 DepthNormalsFragment(Varyings input) : SV_TARGET + { + float3 normalWS = normalize(input.normalWS); + return half4(normalWS * 0.5 + 0.5, 0); + } + ENDHLSL + } } FallBack "Universal Render Pipeline/Unlit" diff --git a/Assets/water.meta b/Assets/water.meta new file mode 100644 index 0000000000..2920bf25c1 --- /dev/null +++ b/Assets/water.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 7fa8f3034a9b2e34dbb43ab302864e9f +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/water/ClearWaterShader.shader b/Assets/water/ClearWaterShader.shader new file mode 100644 index 0000000000..2359b47354 --- /dev/null +++ b/Assets/water/ClearWaterShader.shader @@ -0,0 +1,252 @@ +Shader "Custom/ClearWaterShaderV3" +{ + Properties + { + [Header(Water Colors)] + _ShallowColor ("Shallow Water Color", Color) = (0.325, 0.807, 0.971, 0.8) + _DeepColor ("Deep Water Color", Color) = (0.086, 0.407, 1, 0.95) + _DepthMaxDistance ("Depth Max Distance", Float) = 1 + + [Header(Shore Visibility)] + _ShoreDistance ("Shore Visibility Distance", Range(0, 5)) = 1.0 + _ShoreFade ("Shore Fade Smoothness", Range(0.01, 2)) = 0.5 + + [Header(Foam)] + _FoamColor ("Foam Color", Color) = (1, 1, 1, 1) + _FoamDistance ("Foam Distance", Range(0, 2)) = 0.4 + _FoamIntensity ("Foam Intensity", Range(0, 2)) = 1 + _EdgeFoamWidth ("Edge Foam Width", Range(0.001, 0.5)) = 0.1 + _VertexColorFoamWidth ("Vertex Color Foam Width", Range(0, 1)) = 0.3 + + [Header(Wave Animation)] + _WaveHeight ("Wave Height", Range(0, 0.5)) = 0.05 + _WaveFrequency ("Wave Frequency", Range(0, 10)) = 2 + _WaveSpeed ("Wave Speed", Range(0, 5)) = 1 + _WaveDirection ("Wave Direction", Vector) = (1, 0, 0, 0) + + [Header(Textures)] + _SurfaceNoise ("Surface Noise", 2D) = "white" {} + _SurfaceNoiseCutoff ("Surface Noise Cutoff", Range(0, 1)) = 0.6 + _SurfaceNoiseScale ("Surface Noise Scale", Float) = 1 + + _NormalMap ("Normal Map", 2D) = "bump" {} + _NormalStrength ("Normal Strength", Range(0, 2)) = 0.5 + _NormalScale ("Normal Scale", Float) = 1 + + [Header(Reflection)] + _Smoothness ("Smoothness", Range(0, 1)) = 0.9 + _FresnelPower ("Fresnel Power", Range(0, 10)) = 5 + _ReflectionStrength ("Reflection Strength", Range(0, 1)) = 0.3 + + [Header(Movement)] + _TextureSpeed ("Texture Speed", Float) = 0.1 + } + + SubShader + { + Tags + { + "Queue" = "Transparent" + "RenderType" = "Transparent" + "RenderPipeline" = "UniversalRenderPipeline" + } + + Pass + { + Blend SrcAlpha OneMinusSrcAlpha + ZWrite Off + + HLSLPROGRAM + #pragma vertex vert + #pragma fragment frag + + #include "Packages/com.unity.render-pipelines.universal/ShaderLibrary/Core.hlsl" + #include "Packages/com.unity.render-pipelines.universal/ShaderLibrary/DeclareDepthTexture.hlsl" + #include "Packages/com.unity.render-pipelines.universal/ShaderLibrary/Lighting.hlsl" + + struct Attributes + { + float4 positionOS : POSITION; + float3 normalOS : NORMAL; + float4 tangentOS : TANGENT; + float2 uv : TEXCOORD0; + float4 color : COLOR; + }; + + struct Varyings + { + float4 positionCS : SV_POSITION; + float2 uv : TEXCOORD0; + float4 screenPos : TEXCOORD1; + float3 normalWS : TEXCOORD2; + float3 tangentWS : TEXCOORD3; + float3 bitangentWS : TEXCOORD4; + float3 viewDirWS : TEXCOORD5; + float3 positionWS : TEXCOORD6; + float waveValue : TEXCOORD7; + float4 vertexColor : COLOR; + }; + + sampler2D _SurfaceNoise; + sampler2D _NormalMap; + + CBUFFER_START(UnityPerMaterial) + float _SurfaceNoiseCutoff; + float _SurfaceNoiseScale; + float _FoamDistance; + float _FoamIntensity; + float _EdgeFoamWidth; + float _VertexColorFoamWidth; + float _DepthMaxDistance; + float _NormalStrength; + float _NormalScale; + float _Smoothness; + float _FresnelPower; + float _ReflectionStrength; + float _TextureSpeed; + float _ShoreDistance; + float _ShoreFade; + float _WaveHeight; + float _WaveFrequency; + float _WaveSpeed; + float4 _WaveDirection; + float4 _ShallowColor; + float4 _DeepColor; + float4 _FoamColor; + CBUFFER_END + + float3 TriplanarSample(sampler2D tex, float3 worldPos, float3 worldNormal, float scale, float2 offset) + { + float3 blendWeights = abs(worldNormal); + blendWeights = blendWeights / (blendWeights.x + blendWeights.y + blendWeights.z); + + float3 xSample = tex2D(tex, worldPos.zy * scale + offset).rgb; + float3 ySample = tex2D(tex, worldPos.xz * scale + offset).rgb; + float3 zSample = tex2D(tex, worldPos.xy * scale + offset).rgb; + + return xSample * blendWeights.x + ySample * blendWeights.y + zSample * blendWeights.z; + } + + float3 TriplanarNormal(sampler2D tex, float3 worldPos, float3 worldNormal, float scale, float2 offset) + { + float3 blendWeights = abs(worldNormal); + blendWeights = blendWeights / (blendWeights.x + blendWeights.y + blendWeights.z); + + float3 xNormal = UnpackNormal(tex2D(tex, worldPos.zy * scale + offset)); + float3 yNormal = UnpackNormal(tex2D(tex, worldPos.xz * scale + offset)); + float3 zNormal = UnpackNormal(tex2D(tex, worldPos.xy * scale + offset)); + + return xNormal * blendWeights.x + yNormal * blendWeights.y + zNormal * blendWeights.z; + } + + Varyings vert(Attributes input) + { + Varyings output; + + VertexPositionInputs positionInputs = GetVertexPositionInputs(input.positionOS.xyz); + VertexNormalInputs normalInputs = GetVertexNormalInputs(input.normalOS, input.tangentOS); + + float3 worldPos = positionInputs.positionWS; + + float2 waveDir = normalize(_WaveDirection.xy); + float waveDist = dot(worldPos.xz, waveDir); + float wavePhase = waveDist * _WaveFrequency - _Time.y * _WaveSpeed; + float wave = sin(wavePhase); + + worldPos.y += wave * _WaveHeight; + + output.positionCS = TransformWorldToHClip(worldPos); + output.positionWS = worldPos; + output.screenPos = ComputeScreenPos(output.positionCS); + output.uv = input.uv; + output.normalWS = normalInputs.normalWS; + output.tangentWS = normalInputs.tangentWS; + output.bitangentWS = normalInputs.bitangentWS; + output.viewDirWS = GetWorldSpaceViewDir(worldPos); + output.waveValue = wave * 0.5 + 0.5; + output.vertexColor = input.color; + + return output; + } + + float4 frag(Varyings input) : SV_Target + { + float3 worldNormal = normalize(input.normalWS); + + float2 timeOffset1 = _Time.y * _TextureSpeed * float2(1, 0.5); + float2 timeOffset2 = _Time.y * _TextureSpeed * float2(-0.7, -0.3); + + float3 normalMap1 = TriplanarNormal(_NormalMap, input.positionWS, worldNormal, _NormalScale, timeOffset1); + float3 normalMap2 = TriplanarNormal(_NormalMap, input.positionWS, worldNormal, _NormalScale * 1.3, timeOffset2); + + float3 normalTS = normalize(normalMap1 + normalMap2); + normalTS.xy *= _NormalStrength; + + float3x3 tangentToWorld = float3x3(input.tangentWS, input.bitangentWS, input.normalWS); + float3 normalWS = normalize(mul(normalTS, tangentToWorld)); + + float2 screenUV = input.screenPos.xy / input.screenPos.w; + + float existingDepth01 = SampleSceneDepth(screenUV); + float existingDepthLinear = LinearEyeDepth(existingDepth01, _ZBufferParams); + float surfaceDepthLinear = LinearEyeDepth(input.positionCS.z, _ZBufferParams); + float depthDifference = existingDepthLinear - surfaceDepthLinear; + + float waterDepthDifference01 = saturate(depthDifference / _DepthMaxDistance); + float3 waterColor = lerp(_ShallowColor.rgb, _DeepColor.rgb, waterDepthDifference01); + + float shoreVisibility = saturate(depthDifference / _ShoreDistance); + shoreVisibility = smoothstep(0, _ShoreFade, shoreVisibility); + + // VERTEX COLOR EDGE DETECTION + float vertexEdge = input.vertexColor.r; + float vertexEdgeFoam = smoothstep(_VertexColorFoamWidth, 0, vertexEdge); + + // Depth-based edge detection (for objects like cylinder) + float depthEdge = saturate(depthDifference / _EdgeFoamWidth); + depthEdge = 1.0 - depthEdge; + depthEdge = pow(depthEdge, 2); + + // Combine both methods + float edgeDetection = max(vertexEdgeFoam, depthEdge); + + float wave = pow(input.waveValue, 2); + float foamArea = 1.0 - saturate(depthDifference / _FoamDistance); + float waveContribution = wave * max(foamArea, vertexEdgeFoam); + + float foamNoise1 = TriplanarSample(_SurfaceNoise, input.positionWS, worldNormal, _SurfaceNoiseScale, timeOffset1).r; + float foamNoise2 = TriplanarSample(_SurfaceNoise, input.positionWS, worldNormal, _SurfaceNoiseScale * 1.5, timeOffset2).r; + float combinedNoise = foamNoise1 * foamNoise2; + + float foamMask = smoothstep(_SurfaceNoiseCutoff - 0.1, _SurfaceNoiseCutoff + 0.1, combinedNoise); + + float edgeFoam = edgeDetection * foamMask; + float waveFoam = waveContribution * foamMask; + + float totalFoam = max(edgeFoam, waveFoam * 0.7) * _FoamIntensity; + totalFoam = saturate(totalFoam); + + float3 viewDir = normalize(input.viewDirWS); + float fresnel = pow(1.0 - saturate(dot(normalWS, viewDir)), _FresnelPower); + + Light mainLight = GetMainLight(); + float3 halfVector = normalize(mainLight.direction + viewDir); + float specular = pow(saturate(dot(normalWS, halfVector)), _Smoothness * 128.0); + + float3 reflection = fresnel * _ReflectionStrength; + + float3 finalColor = waterColor; + finalColor += specular * mainLight.color * 0.5; + finalColor = lerp(finalColor, float3(0.7, 0.85, 1), reflection); + finalColor = lerp(finalColor, _FoamColor.rgb, totalFoam * 0.9); + + float baseAlpha = lerp(_ShallowColor.a, _DeepColor.a, waterDepthDifference01); + float shoreAlpha = lerp(0.8, baseAlpha, shoreVisibility); + float finalAlpha = saturate(shoreAlpha + totalFoam * 0.5); + + return float4(finalColor, finalAlpha); + } + ENDHLSL + } + } +} \ No newline at end of file diff --git a/Assets/water/ClearWaterShader.shader.meta b/Assets/water/ClearWaterShader.shader.meta new file mode 100644 index 0000000000..4021b8bdfc --- /dev/null +++ b/Assets/water/ClearWaterShader.shader.meta @@ -0,0 +1,9 @@ +fileFormatVersion: 2 +guid: 9fdb6082ddd77d0409ffb438e5471a8c +ShaderImporter: + externalObjects: {} + defaultTextures: [] + nonModifiableTextures: [] + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/water/Water.mat b/Assets/water/Water.mat new file mode 100644 index 0000000000..b36783ad1f --- /dev/null +++ b/Assets/water/Water.mat @@ -0,0 +1,71 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Water + m_Shader: {fileID: 4800000, guid: 9fdb6082ddd77d0409ffb438e5471a8c, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: [] + m_InvalidKeywords: + - _DEBUGDEPTH_ON + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_LockedProperties: + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _NormalMap: + m_Texture: {fileID: 2800000, guid: 93c0aa606876cb04384552a948f281df, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _SurfaceDistortion: + m_Texture: {fileID: 2800000, guid: dddb9fd8d06274742916ff92e905ae48, type: 3} + m_Scale: {x: 10, y: 10} + m_Offset: {x: 0, y: 0} + - _SurfaceNoise: + m_Texture: {fileID: 2800000, guid: b6f4fa4253519934f96d918d7c34bc8d, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _DeepAlpha: 0.9 + - _DepthMaxDistance: 0.5 + - _EdgeFoamWidth: 0.5 + - _FoamDistance: 1 + - _FoamIntensity: 1 + - _FoamMaxDistance: 1.2 + - _FoamMinDistance: 0.1 + - _FresnelPower: 5 + - _NormalScale: 0.4 + - _NormalSpeed: 0.1 + - _NormalStrength: 1 + - _ReflectionStrength: 1 + - _ShallowAlpha: 0.5 + - _ShoreDistance: 1 + - _ShoreFade: 1 + - _Smoothness: 0.493 + - _SurfaceDistortionAmount: 0.257 + - _SurfaceNoiseCutoff: 0 + - _SurfaceNoiseScale: 1.7 + - _TextureSpeed: 0.3 + - _WaveFrequency: 5 + - _WaveHeight: 0.1 + - _WaveSpeed: 1 + m_Colors: + - _DeepColor: {r: 0, g: 0.7264151, b: 0.67566013, a: 0.749} + - _FoamColor: {r: 1, g: 1, b: 1, a: 1} + - _NormalTiling: {r: 40, g: 40, b: 0, a: 0} + - _ShallowColor: {r: 0.086908154, g: 0.8773585, b: 0.8218133, a: 1} + - _WaveDirection: {r: 1, g: 1, b: 0, a: 0} + m_BuildTextureStacks: [] + m_AllowLocking: 1 diff --git a/Assets/water/Water.mat.meta b/Assets/water/Water.mat.meta new file mode 100644 index 0000000000..21879e634d --- /dev/null +++ b/Assets/water/Water.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 1b9823b5bf0301f4581c148b6a2645f4 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/water/caust26.tga b/Assets/water/caust26.tga new file mode 100644 index 0000000000000000000000000000000000000000..9fadf545b9dc09c13375c589bc4d792dcc4ad882 GIT binary patch literal 16428 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 Le$v!&16uqKTJSU7 literal 0 HcmV?d00001 diff --git a/Assets/water/caust26.tga.meta b/Assets/water/caust26.tga.meta new file mode 100644 index 0000000000..918310bc39 --- /dev/null +++ b/Assets/water/caust26.tga.meta @@ -0,0 +1,117 @@ +fileFormatVersion: 2 +guid: b6f4fa4253519934f96d918d7c34bc8d +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 13 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 0 + wrapV: 0 + wrapW: 0 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 4 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + customData: + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spriteCustomMetadata: + entries: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/water/water_normal00.tga b/Assets/water/water_normal00.tga new file mode 100644 index 0000000000000000000000000000000000000000..1880c67d149e64872ebb31a408f58bd160ddfa3a GIT binary patch literal 262694 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 literal 0 HcmV?d00001 diff --git a/Assets/water/water_normal00.tga.meta b/Assets/water/water_normal00.tga.meta new file mode 100644 index 0000000000..fcecb1ca64 --- /dev/null +++ b/Assets/water/water_normal00.tga.meta @@ -0,0 +1,117 @@ +fileFormatVersion: 2 +guid: 93c0aa606876cb04384552a948f281df +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 13 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + sRGBTexture: 0 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 0 + wrapV: 0 + wrapW: 0 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 1 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 4 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + customData: + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spriteCustomMetadata: + entries: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index e6094ea125..2758853a70 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -13,7 +13,7 @@ PlayerSettings: useOnDemandResources: 0 accelerometerFrequency: 60 companyName: BrewMonster - productName: perfect-world-unity + productName: "Th\u1EBF Gi\u1EDBi Ho\xE0n H\u1EA3o" defaultCursor: {fileID: 0} cursorHotspot: {x: 0, y: 0} m_SplashScreenBackgroundColor: {r: 0.12156863, g: 0.12156863, b: 0.1254902, a: 1} @@ -70,6 +70,7 @@ PlayerSettings: androidStartInFullscreen: 1 androidRenderOutsideSafeArea: 1 androidUseSwappy: 1 + androidDisplayOptions: 1 androidBlitType: 0 androidResizeableActivity: 1 androidDefaultWindowWidth: 1920 @@ -141,7 +142,7 @@ PlayerSettings: loadStoreDebugModeEnabled: 0 visionOSBundleVersion: 1.0 tvOSBundleVersion: 1.0 - bundleVersion: 1.0 + bundleVersion: 0.1.3 preloadedAssets: [] metroInputSource: 0 wsaTransparentSwapchain: 0 @@ -291,7 +292,14 @@ PlayerSettings: AndroidAppBundleSizeToValidate: 200 AndroidReportGooglePlayAppDependencies: 1 androidSymbolsSizeThreshold: 800 - m_BuildTargetIcons: [] + m_BuildTargetIcons: + - m_BuildTarget: + m_Icons: + - serializedVersion: 2 + m_Icon: {fileID: 2800000, guid: 868c09cc52a77aa479da9c226c9cbd50, type: 3} + m_Width: 128 + m_Height: 128 + m_Kind: 0 m_BuildTargetPlatformIcons: - m_BuildTarget: iPhone m_Icons: diff --git a/ProjectSettings/QualitySettings.asset b/ProjectSettings/QualitySettings.asset index 6fbd599cad..19677c6126 100644 --- a/ProjectSettings/QualitySettings.asset +++ b/ProjectSettings/QualitySettings.asset @@ -60,4 +60,7 @@ QualitySettings: excludedTargetPlatforms: - Standalone m_TextureMipmapLimitGroupNames: [] - m_PerPlatformDefaultQuality: {} + m_PerPlatformDefaultQuality: + Android: 0 + Standalone: 0 + iPhone: 0 From 057825c1d9f80f542155ad261cf8cda0e070b7c4 Mon Sep 17 00:00:00 2001 From: Le Duc Anh Date: Thu, 8 Jan 2026 15:17:45 +0700 Subject: [PATCH 04/22] enable depth texture/opaque texture --- Assets/Settings/Mobile_RPAsset.asset | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Assets/Settings/Mobile_RPAsset.asset b/Assets/Settings/Mobile_RPAsset.asset index e75739b1b8..124f6d0229 100644 --- a/Assets/Settings/Mobile_RPAsset.asset +++ b/Assets/Settings/Mobile_RPAsset.asset @@ -19,7 +19,7 @@ MonoBehaviour: m_RendererDataList: - {fileID: 11400000, guid: 65bc7dbf4170f435aa868c779acfb082, type: 2} m_DefaultRendererIndex: 0 - m_RequireDepthTexture: 0 + m_RequireDepthTexture: 1 m_RequireOpaqueTexture: 0 m_OpaqueDownsampling: 0 m_SupportsTerrainHoles: 1 From 892b273ea52af91e37e0c6ebbe2758db20fb6bbb Mon Sep 17 00:00:00 2001 From: VDH Date: Thu, 8 Jan 2026 18:43:10 +0700 Subject: [PATCH 05/22] done ui load name and icon --- .../PerfectWorld/Scripts/MainFiles/EC_Game.cs | 4 - .../Scripts/Managers/CECManager.cs | 2 + .../Scripts/Skills/EC_HostSkillModel.cs | 9 +- .../Scripts/Skills/SkillStubs1.cs | 2 +- Assets/PerfectWorld/Scripts/Skills/skill.cs | 6 +- Assets/PerfectWorld/Scripts/Skills/skill1.cs | 4 +- Assets/PerfectWorld/Scripts/Skills/skill10.cs | 4 +- .../PerfectWorld/Scripts/Skills/skill100.cs | 4 +- .../PerfectWorld/Scripts/Skills/skill101.cs | 2 +- .../PerfectWorld/Scripts/Skills/skill1195.cs | 4 +- .../PerfectWorld/Scripts/Skills/skill176.cs | 4 +- .../PerfectWorld/Scripts/Skills/skill177.cs | 4 +- .../PerfectWorld/Scripts/Skills/skill178.cs | 4 +- .../PerfectWorld/Scripts/Skills/skill179.cs | 4 +- .../PerfectWorld/Scripts/Skills/skill180.cs | 2 +- .../PerfectWorld/Scripts/Skills/skill1805.cs | 4 +- .../PerfectWorld/Scripts/Skills/skill1806.cs | 2 +- .../PerfectWorld/Scripts/Skills/skill1807.cs | 4 +- .../PerfectWorld/Scripts/Skills/skill1808.cs | 4 +- .../PerfectWorld/Scripts/Skills/skill1809.cs | 4 +- .../PerfectWorld/Scripts/Skills/skill181.cs | 2 +- .../PerfectWorld/Scripts/Skills/skill1815.cs | 4 +- .../PerfectWorld/Scripts/Skills/skill1816.cs | 4 +- .../PerfectWorld/Scripts/Skills/skill1817.cs | 4 +- .../PerfectWorld/Scripts/Skills/skill1818.cs | 4 +- .../PerfectWorld/Scripts/Skills/skill1819.cs | 4 +- .../PerfectWorld/Scripts/Skills/skill182.cs | 4 +- .../PerfectWorld/Scripts/Skills/skill183.cs | 4 +- .../PerfectWorld/Scripts/Skills/skill184.cs | 4 +- .../PerfectWorld/Scripts/Skills/skill1864.cs | 2 +- .../PerfectWorld/Scripts/Skills/skill1865.cs | 4 +- .../PerfectWorld/Scripts/Skills/skill1868.cs | 2 +- .../PerfectWorld/Scripts/Skills/skill187.cs | 2 +- .../PerfectWorld/Scripts/Skills/skill1871.cs | 4 +- .../PerfectWorld/Scripts/Skills/skill1872.cs | 2 +- .../PerfectWorld/Scripts/Skills/skill1873.cs | 4 +- .../PerfectWorld/Scripts/Skills/skill1874.cs | 4 +- Assets/PerfectWorld/Scripts/Skills/skill2.cs | 4 +- .../PerfectWorld/Scripts/Skills/skill2206.cs | 4 +- .../PerfectWorld/Scripts/Skills/skill2207.cs | 4 +- .../PerfectWorld/Scripts/Skills/skill2208.cs | 4 +- .../PerfectWorld/Scripts/Skills/skill2209.cs | 4 +- .../PerfectWorld/Scripts/Skills/skill2210.cs | 4 +- .../PerfectWorld/Scripts/Skills/skill2211.cs | 4 +- .../PerfectWorld/Scripts/Skills/skill2254.cs | 4 +- .../PerfectWorld/Scripts/Skills/skill2255.cs | 4 +- .../PerfectWorld/Scripts/Skills/skill2256.cs | 4 +- .../PerfectWorld/Scripts/Skills/skill2257.cs | 4 +- .../PerfectWorld/Scripts/Skills/skill2258.cs | 4 +- .../PerfectWorld/Scripts/Skills/skill2259.cs | 4 +- .../PerfectWorld/Scripts/Skills/skill226.cs | 2 +- .../PerfectWorld/Scripts/Skills/skill2260.cs | 4 +- .../PerfectWorld/Scripts/Skills/skill2261.cs | 4 +- .../PerfectWorld/Scripts/Skills/skill2262.cs | 4 +- .../PerfectWorld/Scripts/Skills/skill2263.cs | 4 +- .../PerfectWorld/Scripts/Skills/skill2264.cs | 4 +- .../PerfectWorld/Scripts/Skills/skill2265.cs | 4 +- .../PerfectWorld/Scripts/Skills/skill227.cs | 2 +- .../PerfectWorld/Scripts/Skills/skill228.cs | 2 +- .../PerfectWorld/Scripts/Skills/skill229.cs | 2 +- .../PerfectWorld/Scripts/Skills/skill2352.cs | 4 +- .../PerfectWorld/Scripts/Skills/skill2367.cs | 4 +- .../PerfectWorld/Scripts/Skills/skill2368.cs | 4 +- .../PerfectWorld/Scripts/Skills/skill2369.cs | 4 +- .../PerfectWorld/Scripts/Skills/skill2370.cs | 4 +- .../PerfectWorld/Scripts/Skills/skill2371.cs | 4 +- .../PerfectWorld/Scripts/Skills/skill2372.cs | 4 +- .../PerfectWorld/Scripts/Skills/skill2373.cs | 4 +- .../PerfectWorld/Scripts/Skills/skill2374.cs | 4 +- .../PerfectWorld/Scripts/Skills/skill2375.cs | 4 +- .../PerfectWorld/Scripts/Skills/skill2452.cs | 4 +- .../PerfectWorld/Scripts/Skills/skill2453.cs | 4 +- Assets/PerfectWorld/Scripts/Skills/skill3.cs | 4 +- .../PerfectWorld/Scripts/Skills/skill362.cs | 2 +- .../PerfectWorld/Scripts/Skills/skill363.cs | 2 +- .../PerfectWorld/Scripts/Skills/skill364.cs | 2 +- .../PerfectWorld/Scripts/Skills/skill365.cs | 2 +- .../PerfectWorld/Scripts/Skills/skill374.cs | 4 +- .../PerfectWorld/Scripts/Skills/skill375.cs | 4 +- .../PerfectWorld/Scripts/Skills/skill376.cs | 4 +- .../PerfectWorld/Scripts/Skills/skill377.cs | 4 +- .../PerfectWorld/Scripts/Skills/skill378.cs | 4 +- .../PerfectWorld/Scripts/Skills/skill379.cs | 4 +- .../PerfectWorld/Scripts/Skills/skill380.cs | 4 +- .../PerfectWorld/Scripts/Skills/skill381.cs | 4 +- .../PerfectWorld/Scripts/Skills/skill382.cs | 4 +- .../PerfectWorld/Scripts/Skills/skill383.cs | 4 +- .../PerfectWorld/Scripts/Skills/skill384.cs | 4 +- .../PerfectWorld/Scripts/Skills/skill385.cs | 4 +- .../PerfectWorld/Scripts/Skills/skill386.cs | 4 +- .../PerfectWorld/Scripts/Skills/skill387.cs | 4 +- .../PerfectWorld/Scripts/Skills/skill388.cs | 4 +- .../PerfectWorld/Scripts/Skills/skill389.cs | 4 +- .../PerfectWorld/Scripts/Skills/skill390.cs | 4 +- .../PerfectWorld/Scripts/Skills/skill391.cs | 4 +- .../PerfectWorld/Scripts/Skills/skill392.cs | 4 +- .../PerfectWorld/Scripts/Skills/skill393.cs | 4 +- .../PerfectWorld/Scripts/Skills/skill394.cs | 4 +- .../PerfectWorld/Scripts/Skills/skill395.cs | 4 +- .../PerfectWorld/Scripts/Skills/skill396.cs | 4 +- .../PerfectWorld/Scripts/Skills/skill397.cs | 4 +- .../PerfectWorld/Scripts/Skills/skill398.cs | 4 +- .../PerfectWorld/Scripts/Skills/skill399.cs | 4 +- Assets/PerfectWorld/Scripts/Skills/skill4.cs | 4 +- .../PerfectWorld/Scripts/Skills/skill400.cs | 4 +- .../PerfectWorld/Scripts/Skills/skill401.cs | 4 +- .../PerfectWorld/Scripts/Skills/skill402.cs | 4 +- .../PerfectWorld/Scripts/Skills/skill403.cs | 4 +- .../PerfectWorld/Scripts/Skills/skill404.cs | 4 +- .../PerfectWorld/Scripts/Skills/skill405.cs | 4 +- .../PerfectWorld/Scripts/Skills/skill406.cs | 4 +- .../PerfectWorld/Scripts/Skills/skill407.cs | 4 +- .../PerfectWorld/Scripts/Skills/skill408.cs | 4 +- .../PerfectWorld/Scripts/Skills/skill409.cs | 4 +- .../PerfectWorld/Scripts/Skills/skill410.cs | 4 +- .../PerfectWorld/Scripts/Skills/skill411.cs | 4 +- .../PerfectWorld/Scripts/Skills/skill412.cs | 4 +- .../PerfectWorld/Scripts/Skills/skill413.cs | 4 +- .../PerfectWorld/Scripts/Skills/skill414.cs | 4 +- .../PerfectWorld/Scripts/Skills/skill415.cs | 4 +- .../PerfectWorld/Scripts/Skills/skill416.cs | 4 +- .../PerfectWorld/Scripts/Skills/skill417.cs | 4 +- .../PerfectWorld/Scripts/Skills/skill418.cs | 4 +- .../PerfectWorld/Scripts/Skills/skill419.cs | 4 +- .../PerfectWorld/Scripts/Skills/skill420.cs | 4 +- .../PerfectWorld/Scripts/Skills/skill421.cs | 4 +- .../PerfectWorld/Scripts/Skills/skill422.cs | 4 +- .../PerfectWorld/Scripts/Skills/skill423.cs | 4 +- .../PerfectWorld/Scripts/Skills/skill424.cs | 4 +- .../PerfectWorld/Scripts/Skills/skill425.cs | 4 +- .../PerfectWorld/Scripts/Skills/skill426.cs | 4 +- .../PerfectWorld/Scripts/Skills/skill427.cs | 4 +- .../PerfectWorld/Scripts/Skills/skill428.cs | 4 +- .../PerfectWorld/Scripts/Skills/skill429.cs | 4 +- .../PerfectWorld/Scripts/Skills/skill430.cs | 4 +- .../PerfectWorld/Scripts/Skills/skill431.cs | 4 +- .../PerfectWorld/Scripts/Skills/skill432.cs | 2 +- .../PerfectWorld/Scripts/Skills/skill433.cs | 2 +- .../PerfectWorld/Scripts/Skills/skill434.cs | 2 +- .../PerfectWorld/Scripts/Skills/skill435.cs | 2 +- .../PerfectWorld/Scripts/Skills/skill436.cs | 2 +- .../PerfectWorld/Scripts/Skills/skill437.cs | 2 +- .../PerfectWorld/Scripts/Skills/skill438.cs | 2 +- .../PerfectWorld/Scripts/Skills/skill439.cs | 2 +- .../PerfectWorld/Scripts/Skills/skill440.cs | 4 +- .../PerfectWorld/Scripts/Skills/skill441.cs | 4 +- .../PerfectWorld/Scripts/Skills/skill442.cs | 2 +- .../PerfectWorld/Scripts/Skills/skill443.cs | 2 +- .../PerfectWorld/Scripts/Skills/skill444.cs | 4 +- .../PerfectWorld/Scripts/Skills/skill445.cs | 4 +- .../PerfectWorld/Scripts/Skills/skill446.cs | 4 +- .../PerfectWorld/Scripts/Skills/skill447.cs | 4 +- .../PerfectWorld/Scripts/Skills/skill448.cs | 4 +- .../PerfectWorld/Scripts/Skills/skill449.cs | 4 +- .../PerfectWorld/Scripts/Skills/skill450.cs | 4 +- .../PerfectWorld/Scripts/Skills/skill451.cs | 4 +- .../PerfectWorld/Scripts/Skills/skill452.cs | 4 +- .../PerfectWorld/Scripts/Skills/skill453.cs | 4 +- .../PerfectWorld/Scripts/Skills/skill454.cs | 4 +- .../PerfectWorld/Scripts/Skills/skill455.cs | 4 +- .../PerfectWorld/Scripts/Skills/skill456.cs | 4 +- .../PerfectWorld/Scripts/Skills/skill457.cs | 4 +- .../PerfectWorld/Scripts/Skills/skill458.cs | 2 +- .../PerfectWorld/Scripts/Skills/skill459.cs | 2 +- .../PerfectWorld/Scripts/Skills/skill460.cs | 4 +- .../PerfectWorld/Scripts/Skills/skill461.cs | 4 +- .../PerfectWorld/Scripts/Skills/skill462.cs | 4 +- .../PerfectWorld/Scripts/Skills/skill463.cs | 4 +- .../PerfectWorld/Scripts/Skills/skill464.cs | 4 +- .../PerfectWorld/Scripts/Skills/skill465.cs | 4 +- .../PerfectWorld/Scripts/Skills/skill466.cs | 4 +- .../PerfectWorld/Scripts/Skills/skill467.cs | 4 +- .../PerfectWorld/Scripts/Skills/skill468.cs | 4 +- .../PerfectWorld/Scripts/Skills/skill469.cs | 4 +- .../PerfectWorld/Scripts/Skills/skill470.cs | 4 +- .../PerfectWorld/Scripts/Skills/skill471.cs | 4 +- .../PerfectWorld/Scripts/Skills/skill472.cs | 4 +- .../PerfectWorld/Scripts/Skills/skill473.cs | 4 +- .../PerfectWorld/Scripts/Skills/skill474.cs | 2 +- .../PerfectWorld/Scripts/Skills/skill475.cs | 2 +- .../PerfectWorld/Scripts/Skills/skill476.cs | 4 +- .../PerfectWorld/Scripts/Skills/skill477.cs | 4 +- .../PerfectWorld/Scripts/Skills/skill478.cs | 4 +- .../PerfectWorld/Scripts/Skills/skill479.cs | 4 +- .../PerfectWorld/Scripts/Skills/skill480.cs | 4 +- .../PerfectWorld/Scripts/Skills/skill481.cs | 4 +- .../PerfectWorld/Scripts/Skills/skill482.cs | 4 +- .../PerfectWorld/Scripts/Skills/skill483.cs | 4 +- .../PerfectWorld/Scripts/Skills/skill484.cs | 4 +- .../PerfectWorld/Scripts/Skills/skill485.cs | 4 +- .../PerfectWorld/Scripts/Skills/skill486.cs | 2 +- .../PerfectWorld/Scripts/Skills/skill487.cs | 2 +- .../PerfectWorld/Scripts/Skills/skill488.cs | 2 +- .../PerfectWorld/Scripts/Skills/skill489.cs | 2 +- .../PerfectWorld/Scripts/Skills/skill490.cs | 2 +- .../PerfectWorld/Scripts/Skills/skill491.cs | 2 +- Assets/PerfectWorld/Scripts/Skills/skill5.cs | 4 +- Assets/PerfectWorld/Scripts/Skills/skill53.cs | 2 +- Assets/PerfectWorld/Scripts/Skills/skill54.cs | 4 +- Assets/PerfectWorld/Scripts/Skills/skill55.cs | 4 +- Assets/PerfectWorld/Scripts/Skills/skill56.cs | 4 +- Assets/PerfectWorld/Scripts/Skills/skill57.cs | 4 +- Assets/PerfectWorld/Scripts/Skills/skill58.cs | 4 +- Assets/PerfectWorld/Scripts/Skills/skill59.cs | 4 +- Assets/PerfectWorld/Scripts/Skills/skill6.cs | 2 +- Assets/PerfectWorld/Scripts/Skills/skill60.cs | 4 +- Assets/PerfectWorld/Scripts/Skills/skill61.cs | 4 +- Assets/PerfectWorld/Scripts/Skills/skill62.cs | 4 +- Assets/PerfectWorld/Scripts/Skills/skill63.cs | 4 +- Assets/PerfectWorld/Scripts/Skills/skill64.cs | 4 +- Assets/PerfectWorld/Scripts/Skills/skill65.cs | 4 +- Assets/PerfectWorld/Scripts/Skills/skill66.cs | 4 +- Assets/PerfectWorld/Scripts/Skills/skill67.cs | 4 +- Assets/PerfectWorld/Scripts/Skills/skill68.cs | 4 +- Assets/PerfectWorld/Scripts/Skills/skill69.cs | 4 +- Assets/PerfectWorld/Scripts/Skills/skill7.cs | 5 +- Assets/PerfectWorld/Scripts/Skills/skill70.cs | 4 +- Assets/PerfectWorld/Scripts/Skills/skill71.cs | 4 +- Assets/PerfectWorld/Scripts/Skills/skill72.cs | 4 +- Assets/PerfectWorld/Scripts/Skills/skill73.cs | 4 +- Assets/PerfectWorld/Scripts/Skills/skill74.cs | 4 +- Assets/PerfectWorld/Scripts/Skills/skill75.cs | 4 +- Assets/PerfectWorld/Scripts/Skills/skill76.cs | 4 +- Assets/PerfectWorld/Scripts/Skills/skill77.cs | 4 +- Assets/PerfectWorld/Scripts/Skills/skill78.cs | 2 +- Assets/PerfectWorld/Scripts/Skills/skill79.cs | 2 +- Assets/PerfectWorld/Scripts/Skills/skill8.cs | 5 +- Assets/PerfectWorld/Scripts/Skills/skill80.cs | 2 +- Assets/PerfectWorld/Scripts/Skills/skill81.cs | 4 +- Assets/PerfectWorld/Scripts/Skills/skill84.cs | 4 +- Assets/PerfectWorld/Scripts/Skills/skill85.cs | 4 +- Assets/PerfectWorld/Scripts/Skills/skill86.cs | 4 +- Assets/PerfectWorld/Scripts/Skills/skill87.cs | 4 +- Assets/PerfectWorld/Scripts/Skills/skill88.cs | 4 +- Assets/PerfectWorld/Scripts/Skills/skill89.cs | 4 +- .../PerfectWorld/Scripts/Skills/skill896.cs | 4 +- .../PerfectWorld/Scripts/Skills/skill897.cs | 4 +- .../PerfectWorld/Scripts/Skills/skill898.cs | 4 +- .../PerfectWorld/Scripts/Skills/skill899.cs | 4 +- Assets/PerfectWorld/Scripts/Skills/skill9.cs | 3 +- Assets/PerfectWorld/Scripts/Skills/skill90.cs | 4 +- .../PerfectWorld/Scripts/Skills/skill900.cs | 4 +- .../PerfectWorld/Scripts/Skills/skill901.cs | 4 +- .../PerfectWorld/Scripts/Skills/skill902.cs | 4 +- .../PerfectWorld/Scripts/Skills/skill903.cs | 4 +- .../PerfectWorld/Scripts/Skills/skill904.cs | 4 +- .../PerfectWorld/Scripts/Skills/skill905.cs | 4 +- Assets/PerfectWorld/Scripts/Skills/skill91.cs | 4 +- Assets/PerfectWorld/Scripts/Skills/skill92.cs | 4 +- .../PerfectWorld/Scripts/Skills/skill923.cs | 4 +- .../PerfectWorld/Scripts/Skills/skill924.cs | 4 +- .../PerfectWorld/Scripts/Skills/skill925.cs | 4 +- .../PerfectWorld/Scripts/Skills/skill926.cs | 4 +- Assets/PerfectWorld/Scripts/Skills/skill93.cs | 4 +- Assets/PerfectWorld/Scripts/Skills/skill94.cs | 2 +- Assets/PerfectWorld/Scripts/Skills/skill95.cs | 4 +- Assets/PerfectWorld/Scripts/Skills/skill96.cs | 2 +- Assets/PerfectWorld/Scripts/Skills/skill97.cs | 4 +- Assets/PerfectWorld/Scripts/Skills/skill98.cs | 4 +- Assets/PerfectWorld/Scripts/Skills/skill99.cs | 4 +- .../Scripts/UI/Dialogs/CDlgSkillSubList.cs | 66 +- .../UI/GamePlay/SkillUI/AUISubDialog.cs | 1 - .../GamePlay/SkillUI/CDlgSkillSubListItem.cs | 38 +- Assets/Prefabs/UI/SkillUI.prefab | 100 +- Assets/Scenes/a61.unity | 4 +- Assets/Scripts/CECStringTab.cs | 8 +- .../LiberationSans SDF - Fallback.asset | 890 +++++++++++++++++- 267 files changed, 1491 insertions(+), 574 deletions(-) diff --git a/Assets/PerfectWorld/Scripts/MainFiles/EC_Game.cs b/Assets/PerfectWorld/Scripts/MainFiles/EC_Game.cs index f767b92d35..adcbc3d2d3 100644 --- a/Assets/PerfectWorld/Scripts/MainFiles/EC_Game.cs +++ b/Assets/PerfectWorld/Scripts/MainFiles/EC_Game.cs @@ -110,10 +110,6 @@ namespace BrewMonster.Network { m_pGFXCaster = new CECGFXCaster(); // return false; - } - if (!m_SkillDesc.Init("skillstr", true)) - { - } GetGameRun().Init(); InitializeStringTables(); diff --git a/Assets/PerfectWorld/Scripts/Managers/CECManager.cs b/Assets/PerfectWorld/Scripts/Managers/CECManager.cs index 541c4adc79..82cec3e0fc 100644 --- a/Assets/PerfectWorld/Scripts/Managers/CECManager.cs +++ b/Assets/PerfectWorld/Scripts/Managers/CECManager.cs @@ -157,6 +157,8 @@ namespace BrewMonster.Managers + + diff --git a/Assets/PerfectWorld/Scripts/Skills/EC_HostSkillModel.cs b/Assets/PerfectWorld/Scripts/Skills/EC_HostSkillModel.cs index 233dd99e62..f8f39a97aa 100644 --- a/Assets/PerfectWorld/Scripts/Skills/EC_HostSkillModel.cs +++ b/Assets/PerfectWorld/Scripts/Skills/EC_HostSkillModel.cs @@ -1,3 +1,4 @@ +using Animancer; using CSNetwork; using CSNetwork.GPDataType; using ModelRenderer.Scripts.GameData; @@ -117,7 +118,11 @@ namespace BrewMonster.Scripts.Skills } } private readonly HashSet m_curServiceSkills = new HashSet(); - + public string GetSkillIcon(int skillID) + { + CECSkill skill = new CECSkill(skillID, 1); + return (skill.GetIconFile()); + } public void SetCurServiceSkills(int tid) { m_curServiceSkills.Clear(); @@ -340,7 +345,7 @@ namespace BrewMonster.Scripts.Skills m_allRankProfSkills[pSkill.GetRank()].Add((int)curID); } } - + BMLogger.LogError("CECHostSkillModel::InitAllSkillsOfCurProf: total prof skills = " + m_allRankProfSkills.Count); // --- B3: Sắp xếp skill trong từng rank theo thứ tự hiển thị --- foreach (var kvp in m_allRankProfSkills) { diff --git a/Assets/PerfectWorld/Scripts/Skills/SkillStubs1.cs b/Assets/PerfectWorld/Scripts/Skills/SkillStubs1.cs index 80f9dab211..5df50bc02b 100644 --- a/Assets/PerfectWorld/Scripts/Skills/SkillStubs1.cs +++ b/Assets/PerfectWorld/Scripts/Skills/SkillStubs1.cs @@ -5,7 +5,7 @@ namespace BrewMonster { public static class SkillStubs { - public static void Init() { int i = 0; } + public static void Init() { int i = 0; } // Skill stub declarations public static Skill1Stub __stub_Skill1Stub = new Skill1Stub(); public static Skill2Stub __stub_Skill2Stub = new Skill2Stub(); diff --git a/Assets/PerfectWorld/Scripts/Skills/skill.cs b/Assets/PerfectWorld/Scripts/Skills/skill.cs index a43e03158a..059647e429 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill.cs @@ -196,7 +196,7 @@ namespace BrewMonster.Scripts.Skills public static Dictionary> inheritSkillMap = new Dictionary>(); -#if UNITY_EDITOR +/*#if UNITY_EDITOR [RuntimeInitializeOnLoadMethod(RuntimeInitializeLoadType.BeforeSceneLoad)] private static void OnPlay() { @@ -205,10 +205,9 @@ namespace BrewMonster.Scripts.Skills comboSkillMap = new Dictionary>(); inheritSkillMap = new Dictionary>(); } -#endif +#endif*/ public SkillStub(uint i) { - BMLogger.LogError("SkillStub Constructor id=" + i); id = i; is_inherent = (false); is_movingcast = (false); @@ -218,7 +217,6 @@ namespace BrewMonster.Scripts.Skills combosk_nobreak = (0); if (GetStub(id) == null) { - BMLogger.LogError("SkillStub Add to Map id=" + id); GetMap().Add(id, this); } } diff --git a/Assets/PerfectWorld/Scripts/Skills/skill1.cs b/Assets/PerfectWorld/Scripts/Skills/skill1.cs index e3bd2beea0..2b672757f4 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill1.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill1.cs @@ -86,7 +86,7 @@ namespace BrewMonster cls = 0; name = "虎击"; nativename = "虎击"; - icon = "虎击.dds"; + icon = "虎击"; max_level = 10; type = 1; apcost = 0; @@ -107,7 +107,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "虎击.sgc"; + effect = "虎击"; doenchant = 0; dobless = 0; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill10.cs b/Assets/PerfectWorld/Scripts/Skills/skill10.cs index b73cde784a..af0b575f24 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill10.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill10.cs @@ -86,7 +86,7 @@ namespace BrewMonster cls = 1; name = "沙陷"; nativename = "沙陷"; - icon = "沙陷.dds"; + icon = "沙陷"; max_level = 10; type = 1; apcost = 0; @@ -107,7 +107,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "沙陷.sgc"; + effect = "沙陷"; doenchant = 1; dobless = 0; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill100.cs b/Assets/PerfectWorld/Scripts/Skills/skill100.cs index 42ca306b50..8dd1443aa7 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill100.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill100.cs @@ -82,7 +82,7 @@ namespace BrewMonster cls = 1; name = "缩地术"; nativename = "缩地术"; - icon = "缩地术.dds"; + icon = "缩地术"; max_level = 10; type = 8; apcost = 20; @@ -102,7 +102,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "缩地术.sgc"; + effect = "缩地术"; doenchant = 0; dobless = 0; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill101.cs b/Assets/PerfectWorld/Scripts/Skills/skill101.cs index f463ba283b..7d98a097b8 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill101.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill101.cs @@ -31,7 +31,7 @@ namespace BrewMonster cls = 1; name = "土精通"; nativename = "土精通"; - icon = "土精通.dds"; + icon = "土精通"; max_level = 10; type = 5; apcost = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill1195.cs b/Assets/PerfectWorld/Scripts/Skills/skill1195.cs index f586c4425c..5b7aadfb32 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill1195.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill1195.cs @@ -84,7 +84,7 @@ namespace BrewMonster cls = 0; name = "致盲（废弃）"; nativename = "致盲（废弃）"; - icon = "致盲.dds"; + icon = "致盲"; max_level = 10; type = 1; apcost = 0; @@ -105,7 +105,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "疾风霹雳.sgc"; + effect = "疾风霹雳"; doenchant = 1; dobless = 0; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill176.cs b/Assets/PerfectWorld/Scripts/Skills/skill176.cs index fd26966e0b..a48248d547 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill176.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill176.cs @@ -49,7 +49,7 @@ namespace BrewMonster cls = 0; name = "凌波微步"; nativename = "凌波微步"; - icon = "凌波微步.dds"; + icon = "凌波微步"; max_level = 1; type = 2; apcost = 100; @@ -70,7 +70,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "凌波微步.sgc"; + effect = "凌波微步"; doenchant = 1; dobless = 0; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill177.cs b/Assets/PerfectWorld/Scripts/Skills/skill177.cs index 37b8e169cd..e2d0f5dbb4 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill177.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill177.cs @@ -49,7 +49,7 @@ namespace BrewMonster cls = 0; name = "易筋经"; nativename = "易筋经"; - icon = "易筋经.dds"; + icon = "易筋经"; max_level = 10; type = 2; apcost = 0; @@ -70,7 +70,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "易筋经.sgc"; + effect = "易筋经"; doenchant = 1; dobless = 0; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill178.cs b/Assets/PerfectWorld/Scripts/Skills/skill178.cs index e24ff4fee5..94266adb0c 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill178.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill178.cs @@ -49,7 +49,7 @@ namespace BrewMonster cls = 0; name = "易髓经"; nativename = "易髓经"; - icon = "易髓经.dds"; + icon = "易髓经"; max_level = 10; type = 2; apcost = 0; @@ -70,7 +70,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "易髓经.sgc"; + effect = "易髓经"; doenchant = 1; dobless = 0; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill179.cs b/Assets/PerfectWorld/Scripts/Skills/skill179.cs index 462e4ec119..807b71d7ff 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill179.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill179.cs @@ -49,7 +49,7 @@ namespace BrewMonster cls = 0; name = "金刚经"; nativename = "金刚经"; - icon = "金刚经.dds"; + icon = "金刚经"; max_level = 10; type = 2; apcost = 100; @@ -70,7 +70,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "金刚经.sgc"; + effect = "金刚经"; doenchant = 1; dobless = 0; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill180.cs b/Assets/PerfectWorld/Scripts/Skills/skill180.cs index 00dc073b4a..d0465305b0 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill180.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill180.cs @@ -83,7 +83,7 @@ namespace BrewMonster cls = 1; name = "寒冰护甲"; nativename = "寒冰护甲"; - icon = "寒冰护甲.dds"; + icon = "寒冰护甲"; max_level = 10; type = 2; apcost = 30; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill1805.cs b/Assets/PerfectWorld/Scripts/Skills/skill1805.cs index ce7a647fa9..d0b73d4544 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill1805.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill1805.cs @@ -84,7 +84,7 @@ namespace BrewMonster cls = 1; name = "秘法之光"; nativename = "秘法之光"; - icon = "法之奥义.dds"; + icon = "法之奥义"; max_level = 1; type = 2; apcost = 30; @@ -105,7 +105,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "法师_法之奥义.sgc"; + effect = "法师_法之奥义"; doenchant = 1; dobless = 0; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill1806.cs b/Assets/PerfectWorld/Scripts/Skills/skill1806.cs index 68466532cc..98d058d6e3 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill1806.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill1806.cs @@ -84,7 +84,7 @@ namespace BrewMonster cls = 1; name = "冰晶世界"; nativename = "冰晶世界"; - icon = "冰晶世界.dds"; + icon = "冰晶世界"; max_level = 1; type = 2; apcost = 200; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill1807.cs b/Assets/PerfectWorld/Scripts/Skills/skill1807.cs index a2c64be715..9331980ce7 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill1807.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill1807.cs @@ -84,7 +84,7 @@ namespace BrewMonster cls = 1; name = "太虚·逆空诀"; nativename = "太虚·逆空诀"; - icon = "静谧之术.dds"; + icon = "静谧之术"; max_level = 1; type = 3; apcost = 20; @@ -106,7 +106,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "法师_静谧之术.sgc"; + effect = "法师_静谧之术"; doenchant = 1; dobless = 0; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill1808.cs b/Assets/PerfectWorld/Scripts/Skills/skill1808.cs index 7e0990f464..489ca14dc9 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill1808.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill1808.cs @@ -84,7 +84,7 @@ namespace BrewMonster cls = 1; name = "煌黑之焰"; nativename = "煌黑之焰"; - icon = "炙焰.dds"; + icon = "炙焰"; max_level = 1; type = 3; apcost = 100; @@ -105,7 +105,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "法师_灸焰.sgc"; + effect = "法师_灸焰"; doenchant = 1; dobless = 0; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill1809.cs b/Assets/PerfectWorld/Scripts/Skills/skill1809.cs index b16b053041..62498a6b47 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill1809.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill1809.cs @@ -84,7 +84,7 @@ namespace BrewMonster cls = 1; name = "沙之守护"; nativename = "沙之守护"; - icon = "沙暴.dds"; + icon = "沙暴"; max_level = 1; type = 2; apcost = 0; @@ -105,7 +105,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "法师_沙暴.sgc"; + effect = "法师_沙暴"; doenchant = 1; dobless = 0; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill181.cs b/Assets/PerfectWorld/Scripts/Skills/skill181.cs index 847f9fc6a7..fd797a5ee7 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill181.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill181.cs @@ -83,7 +83,7 @@ namespace BrewMonster cls = 1; name = "磐石护甲"; nativename = "磐石护甲"; - icon = "奇门护甲.dds"; + icon = "奇门护甲"; max_level = 10; type = 2; apcost = 30; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill1815.cs b/Assets/PerfectWorld/Scripts/Skills/skill1815.cs index 0ddf0d3353..35f8c847e1 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill1815.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill1815.cs @@ -84,7 +84,7 @@ namespace BrewMonster cls = 0; name = "一骑紫尘"; nativename = "一骑紫尘"; - icon = "霸气.dds"; + icon = "霸气"; max_level = 1; type = 8; apcost = 50; @@ -105,7 +105,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "巫师_复仇雷霆.sgc"; + effect = "巫师_复仇雷霆"; doenchant = 1; dobless = 0; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill1816.cs b/Assets/PerfectWorld/Scripts/Skills/skill1816.cs index 9a928fe613..6505b61b16 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill1816.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill1816.cs @@ -84,7 +84,7 @@ namespace BrewMonster cls = 0; name = "太虚·诛神诀"; nativename = "太虚·诛神诀"; - icon = "狂风.dds"; + icon = "狂风"; max_level = 1; type = 2; apcost = 300; @@ -106,7 +106,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "武侠_狂风.sgc"; + effect = "武侠_狂风"; doenchant = 1; dobless = 0; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill1817.cs b/Assets/PerfectWorld/Scripts/Skills/skill1817.cs index 29b6dca10c..7c2a186dd0 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill1817.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill1817.cs @@ -87,7 +87,7 @@ namespace BrewMonster cls = 0; name = "天元逆转"; nativename = "天元逆转"; - icon = "碎颅.dds"; + icon = "碎颅"; max_level = 1; type = 1; apcost = 0; @@ -108,7 +108,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "武侠_碎颅.sgc"; + effect = "武侠_碎颅"; doenchant = 1; dobless = 0; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill1818.cs b/Assets/PerfectWorld/Scripts/Skills/skill1818.cs index ed352d36a2..9d7d98f8f7 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill1818.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill1818.cs @@ -87,7 +87,7 @@ namespace BrewMonster cls = 0; name = "一掷乾坤"; nativename = "一掷乾坤"; - icon = "回旋击.dds"; + icon = "回旋击"; max_level = 1; type = 1; apcost = 35; @@ -108,7 +108,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "武侠_回旋击.sgc"; + effect = "武侠_回旋击"; doenchant = 1; dobless = 1; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill1819.cs b/Assets/PerfectWorld/Scripts/Skills/skill1819.cs index 6bf9dcc506..3bf714c9b7 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill1819.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill1819.cs @@ -84,7 +84,7 @@ namespace BrewMonster cls = 0; name = "赤龙索"; nativename = "赤龙索"; - icon = "龙依.dds"; + icon = "龙依"; max_level = 1; type = 3; apcost = 50; @@ -105,7 +105,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "武侠_龙爪手.sgc"; + effect = "武侠_龙爪手"; doenchant = 1; dobless = 0; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill182.cs b/Assets/PerfectWorld/Scripts/Skills/skill182.cs index a2b3a8a215..f1bbb8245f 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill182.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill182.cs @@ -86,7 +86,7 @@ namespace BrewMonster cls = 1; name = "冰雹"; nativename = "冰雹"; - icon = "冰雹.dds"; + icon = "冰雹"; max_level = 10; type = 1; apcost = 0; @@ -107,7 +107,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 3; - effect = "冰雹.sgc"; + effect = "冰雹"; doenchant = 1; dobless = 0; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill183.cs b/Assets/PerfectWorld/Scripts/Skills/skill183.cs index e303556109..ce37d13381 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill183.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill183.cs @@ -48,7 +48,7 @@ namespace BrewMonster cls = 1; name = "般若心经"; nativename = "般若心经"; - icon = "般若心经.dds"; + icon = "般若心经"; max_level = 1; type = 2; apcost = 200; @@ -69,7 +69,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "般若心经.sgc"; + effect = "般若心经"; doenchant = 1; dobless = 0; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill184.cs b/Assets/PerfectWorld/Scripts/Skills/skill184.cs index f2491f29fd..a9a267564c 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill184.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill184.cs @@ -83,7 +83,7 @@ namespace BrewMonster cls = 1; name = "石破天惊"; nativename = "石破天惊"; - icon = "石破天惊.dds"; + icon = "石破天惊"; max_level = 10; type = 3; apcost = 0; @@ -104,7 +104,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "石破天惊.sgc"; + effect = "石破天惊"; doenchant = 1; dobless = 0; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill1864.cs b/Assets/PerfectWorld/Scripts/Skills/skill1864.cs index b96541edb8..9193573459 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill1864.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill1864.cs @@ -49,7 +49,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 0; - effect = "法师_冰晶世界.sgc"; + effect = "法师_冰晶世界"; doenchant = 1; dobless = 0; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill1865.cs b/Assets/PerfectWorld/Scripts/Skills/skill1865.cs index 3a0f8d4fb5..c979436877 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill1865.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill1865.cs @@ -84,7 +84,7 @@ namespace BrewMonster cls = 1; name = "太虚·逆流诀"; nativename = "太虚·逆流诀"; - icon = "静谧之术2.dds"; + icon = "静谧之术2"; max_level = 1; type = 3; apcost = 20; @@ -106,7 +106,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "静谧之术2_击中.sgc"; + effect = "静谧之术2_击中"; doenchant = 1; dobless = 0; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill1868.cs b/Assets/PerfectWorld/Scripts/Skills/skill1868.cs index 622592ba12..01fac4990c 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill1868.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill1868.cs @@ -49,7 +49,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 0; - effect = "武侠_狂风.sgc"; + effect = "武侠_狂风"; doenchant = 1; dobless = 0; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill187.cs b/Assets/PerfectWorld/Scripts/Skills/skill187.cs index 15b4b42267..7f7b89f6b3 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill187.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill187.cs @@ -30,7 +30,7 @@ namespace BrewMonster cls = 0; name = "2233"; nativename = "2233"; - icon = "无效.ddsdd"; + icon = "无效"; max_level = 12; type = 10; apcost = 2233; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill1871.cs b/Assets/PerfectWorld/Scripts/Skills/skill1871.cs index 9fe3c2fa1b..b44293639d 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill1871.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill1871.cs @@ -84,7 +84,7 @@ namespace BrewMonster cls = 0; name = "诛神诀"; nativename = "诛神诀"; - icon = "狂风.dds"; + icon = "狂风"; max_level = 1; type = 2; apcost = 299; @@ -105,7 +105,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "武侠_狂风.sgc"; + effect = "武侠_狂风"; doenchant = 1; dobless = 0; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill1872.cs b/Assets/PerfectWorld/Scripts/Skills/skill1872.cs index 2fb237bb32..a076d47f92 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill1872.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill1872.cs @@ -49,7 +49,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 0; - effect = "武侠_狂风.sgc"; + effect = "武侠_狂风"; doenchant = 1; dobless = 0; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill1873.cs b/Assets/PerfectWorld/Scripts/Skills/skill1873.cs index f2cc022ba4..ff498c6d7c 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill1873.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill1873.cs @@ -84,7 +84,7 @@ namespace BrewMonster cls = 1; name = "逆空诀"; nativename = "逆空诀"; - icon = "静谧之术.dds"; + icon = "静谧之术"; max_level = 1; type = 3; apcost = 50; @@ -105,7 +105,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "法师_静谧之术.sgc"; + effect = "法师_静谧之术"; doenchant = 1; dobless = 0; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill1874.cs b/Assets/PerfectWorld/Scripts/Skills/skill1874.cs index 7c964cdf58..3b56e23091 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill1874.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill1874.cs @@ -84,7 +84,7 @@ namespace BrewMonster cls = 1; name = "逆流诀"; nativename = "逆流诀"; - icon = "静谧之术2.dds"; + icon = "静谧之术2"; max_level = 1; type = 3; apcost = 50; @@ -105,7 +105,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "静谧之术2_击中.sgc"; + effect = "静谧之术2_击中"; doenchant = 1; dobless = 0; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill2.cs b/Assets/PerfectWorld/Scripts/Skills/skill2.cs index 3fa0993399..be1f2e3e32 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill2.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill2.cs @@ -86,7 +86,7 @@ namespace BrewMonster cls = 0; name = "寸力"; nativename = "寸力"; - icon = "寸力.dds"; + icon = "寸力"; max_level = 10; type = 1; apcost = 0; @@ -107,7 +107,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "寸力.sgc"; + effect = "寸力"; doenchant = 1; dobless = 0; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill2206.cs b/Assets/PerfectWorld/Scripts/Skills/skill2206.cs index 594ed4e4dd..f30291db0f 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill2206.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill2206.cs @@ -87,7 +87,7 @@ namespace BrewMonster cls = 0; name = "玄·虎崩"; nativename = "玄·虎崩"; - icon = "玄·虎崩.dds"; + icon = "玄·虎崩"; max_level = 1; type = 1; apcost = 0; @@ -109,7 +109,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "武侠_虎击改.sgc"; + effect = "武侠_虎击改"; doenchant = 1; dobless = 0; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill2207.cs b/Assets/PerfectWorld/Scripts/Skills/skill2207.cs index b02f5db98c..2466a5634f 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill2207.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill2207.cs @@ -87,7 +87,7 @@ namespace BrewMonster cls = 0; name = "荒·虎崩"; nativename = "荒·虎崩"; - icon = "荒·虎崩.dds"; + icon = "荒·虎崩"; max_level = 1; type = 1; apcost = 0; @@ -109,7 +109,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "武侠_虎击改.sgc"; + effect = "武侠_虎击改"; doenchant = 1; dobless = 0; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill2208.cs b/Assets/PerfectWorld/Scripts/Skills/skill2208.cs index 98d85f0cbb..29cd07e7e5 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill2208.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill2208.cs @@ -87,7 +87,7 @@ namespace BrewMonster cls = 0; name = "玄·千军辟易"; nativename = "玄·千军辟易"; - icon = "玄·千军辟易.dds"; + icon = "玄·千军辟易"; max_level = 1; type = 1; apcost = 0; @@ -109,7 +109,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "武侠_横扫千军改.sgc"; + effect = "武侠_横扫千军改"; doenchant = 0; dobless = 0; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill2209.cs b/Assets/PerfectWorld/Scripts/Skills/skill2209.cs index e9937f0690..34ef590b00 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill2209.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill2209.cs @@ -87,7 +87,7 @@ namespace BrewMonster cls = 0; name = "荒·千军辟易"; nativename = "荒·千军辟易"; - icon = "荒·千军辟易.dds"; + icon = "荒·千军辟易"; max_level = 1; type = 1; apcost = 0; @@ -109,7 +109,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "武侠_横扫千军改.sgc"; + effect = "武侠_横扫千军改"; doenchant = 0; dobless = 0; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill2210.cs b/Assets/PerfectWorld/Scripts/Skills/skill2210.cs index c2cbe6713d..c4c3b3fcfa 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill2210.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill2210.cs @@ -87,7 +87,7 @@ namespace BrewMonster cls = 0; name = "玄·断水凌风"; nativename = "玄·断水凌风"; - icon = "玄·断水凌风.dds"; + icon = "玄·断水凌风"; max_level = 1; type = 1; apcost = 0; @@ -109,7 +109,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "武侠_凌风改.sgc"; + effect = "武侠_凌风改"; doenchant = 1; dobless = 0; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill2211.cs b/Assets/PerfectWorld/Scripts/Skills/skill2211.cs index d5b73e1567..ceef6d52c8 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill2211.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill2211.cs @@ -87,7 +87,7 @@ namespace BrewMonster cls = 0; name = "荒·断水凌风"; nativename = "荒·断水凌风"; - icon = "荒·断水凌风.dds"; + icon = "荒·断水凌风"; max_level = 1; type = 1; apcost = 0; @@ -109,7 +109,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "武侠_凌风改.sgc"; + effect = "武侠_凌风改"; doenchant = 1; dobless = 0; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill2254.cs b/Assets/PerfectWorld/Scripts/Skills/skill2254.cs index 3324845cf5..57d1d98daf 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill2254.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill2254.cs @@ -84,7 +84,7 @@ namespace BrewMonster cls = 1; name = "玄·磐石护甲"; nativename = "玄·磐石护甲"; - icon = "奇门护甲1.dds"; + icon = "奇门护甲1"; max_level = 1; type = 2; apcost = 10; @@ -106,7 +106,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "法师_磐石护甲.sgc"; + effect = "法师_磐石护甲"; doenchant = 1; dobless = 0; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill2255.cs b/Assets/PerfectWorld/Scripts/Skills/skill2255.cs index 47e883d4a5..055960c6fe 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill2255.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill2255.cs @@ -84,7 +84,7 @@ namespace BrewMonster cls = 1; name = "荒·磐石护甲"; nativename = "荒·磐石护甲"; - icon = "奇门护甲2.dds"; + icon = "奇门护甲2"; max_level = 1; type = 2; apcost = 10; @@ -106,7 +106,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "法师_磐石护甲.sgc"; + effect = "法师_磐石护甲"; doenchant = 1; dobless = 0; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill2256.cs b/Assets/PerfectWorld/Scripts/Skills/skill2256.cs index 88ab29002e..2d49478f50 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill2256.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill2256.cs @@ -84,7 +84,7 @@ namespace BrewMonster cls = 1; name = "玄·烈焰护甲"; nativename = "玄·烈焰护甲"; - icon = "烈焰护甲1.dds"; + icon = "烈焰护甲1"; max_level = 1; type = 2; apcost = 0; @@ -106,7 +106,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "法师_烈焰护甲.sgc"; + effect = "法师_烈焰护甲"; doenchant = 1; dobless = 0; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill2257.cs b/Assets/PerfectWorld/Scripts/Skills/skill2257.cs index 2e39a0aa93..07325fd278 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill2257.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill2257.cs @@ -84,7 +84,7 @@ namespace BrewMonster cls = 1; name = "荒·烈焰护甲"; nativename = "荒·烈焰护甲"; - icon = "烈焰护甲2.dds"; + icon = "烈焰护甲2"; max_level = 1; type = 2; apcost = 0; @@ -106,7 +106,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "法师_烈焰护甲.sgc"; + effect = "法师_烈焰护甲"; doenchant = 1; dobless = 0; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill2258.cs b/Assets/PerfectWorld/Scripts/Skills/skill2258.cs index 91f711db60..14735dbcbe 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill2258.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill2258.cs @@ -84,7 +84,7 @@ namespace BrewMonster cls = 1; name = "玄·寒冰护甲"; nativename = "玄·寒冰护甲"; - icon = "寒冰护甲1.dds"; + icon = "寒冰护甲1"; max_level = 1; type = 2; apcost = 0; @@ -106,7 +106,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "法师_寒冰护甲.sgc"; + effect = "法师_寒冰护甲"; doenchant = 1; dobless = 0; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill2259.cs b/Assets/PerfectWorld/Scripts/Skills/skill2259.cs index 473a3642d3..fb1f98b1ab 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill2259.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill2259.cs @@ -84,7 +84,7 @@ namespace BrewMonster cls = 1; name = "荒·寒冰护甲"; nativename = "荒·寒冰护甲"; - icon = "寒冰护甲2.dds"; + icon = "寒冰护甲2"; max_level = 1; type = 2; apcost = 0; @@ -106,7 +106,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "法师_寒冰护甲.sgc"; + effect = "法师_寒冰护甲"; doenchant = 1; dobless = 0; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill226.cs b/Assets/PerfectWorld/Scripts/Skills/skill226.cs index da79367a05..eeb5818775 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill226.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill226.cs @@ -81,7 +81,7 @@ namespace BrewMonster cls = 0; name = "真元爆发"; nativename = "真元爆发"; - icon = "爆气1.dds"; + icon = "爆气1"; max_level = 1; type = 2; apcost = 100; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill2260.cs b/Assets/PerfectWorld/Scripts/Skills/skill2260.cs index 84f91754a8..5ba59fb60c 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill2260.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill2260.cs @@ -87,7 +87,7 @@ namespace BrewMonster cls = 1; name = "废弃"; nativename = "废弃"; - icon = "玄·业火符.dds"; + icon = "玄·业火符"; max_level = 1; type = 1; apcost = 0; @@ -109,7 +109,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "法师_业火符.sgc"; + effect = "法师_业火符"; doenchant = 0; dobless = 0; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill2261.cs b/Assets/PerfectWorld/Scripts/Skills/skill2261.cs index e3ae1197b0..f74cb586e7 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill2261.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill2261.cs @@ -87,7 +87,7 @@ namespace BrewMonster cls = 1; name = "废弃"; nativename = "废弃"; - icon = "荒·业火符.dds"; + icon = "荒·业火符"; max_level = 1; type = 1; apcost = 0; @@ -109,7 +109,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "法师_业火符.sgc"; + effect = "法师_业火符"; doenchant = 0; dobless = 0; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill2262.cs b/Assets/PerfectWorld/Scripts/Skills/skill2262.cs index 4af503383b..e9ed2628eb 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill2262.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill2262.cs @@ -84,7 +84,7 @@ namespace BrewMonster cls = 1; name = "玄·霜刃"; nativename = "玄·霜刃"; - icon = "玄·霜天之刃.dds"; + icon = "玄·霜天之刃"; max_level = 1; type = 2; apcost = 0; @@ -106,7 +106,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "法师_寒霜.sgc"; + effect = "法师_寒霜"; doenchant = 1; dobless = 0; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill2263.cs b/Assets/PerfectWorld/Scripts/Skills/skill2263.cs index 412c5546d5..10b7cc2940 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill2263.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill2263.cs @@ -84,7 +84,7 @@ namespace BrewMonster cls = 1; name = "荒·霜刃"; nativename = "荒·霜刃"; - icon = "荒·霜天之刃.dds"; + icon = "荒·霜天之刃"; max_level = 1; type = 2; apcost = 0; @@ -106,7 +106,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "法师_寒霜.sgc"; + effect = "法师_寒霜"; doenchant = 1; dobless = 0; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill2264.cs b/Assets/PerfectWorld/Scripts/Skills/skill2264.cs index 3830037fbc..b08811b154 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill2264.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill2264.cs @@ -87,7 +87,7 @@ namespace BrewMonster cls = 1; name = "玄·沙瀑"; nativename = "玄·沙瀑"; - icon = "玄·沙瀑.dds"; + icon = "玄·沙瀑"; max_level = 1; type = 1; apcost = 0; @@ -109,7 +109,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "法师_沙石咒.sgc"; + effect = "法师_沙石咒"; doenchant = 1; dobless = 0; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill2265.cs b/Assets/PerfectWorld/Scripts/Skills/skill2265.cs index 3e05a45334..99cb279b1c 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill2265.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill2265.cs @@ -87,7 +87,7 @@ namespace BrewMonster cls = 1; name = "荒·沙瀑"; nativename = "荒·沙瀑"; - icon = "荒·沙瀑.dds"; + icon = "荒·沙瀑"; max_level = 1; type = 1; apcost = 0; @@ -109,7 +109,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "法师_沙石咒.sgc"; + effect = "法师_沙石咒"; doenchant = 1; dobless = 0; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill227.cs b/Assets/PerfectWorld/Scripts/Skills/skill227.cs index 91211919ff..18f7c35cdc 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill227.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill227.cs @@ -81,7 +81,7 @@ namespace BrewMonster cls = 0; name = "高级真元爆发"; nativename = "高级真元爆发"; - icon = "爆气2.dds"; + icon = "爆气2"; max_level = 1; type = 2; apcost = 200; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill228.cs b/Assets/PerfectWorld/Scripts/Skills/skill228.cs index 92236debc2..36681c16fa 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill228.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill228.cs @@ -81,7 +81,7 @@ namespace BrewMonster cls = 1; name = "真元爆发"; nativename = "真元爆发"; - icon = "爆气1.dds"; + icon = "爆气1"; max_level = 1; type = 2; apcost = 100; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill229.cs b/Assets/PerfectWorld/Scripts/Skills/skill229.cs index 70d611b60a..c4830d2de4 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill229.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill229.cs @@ -81,7 +81,7 @@ namespace BrewMonster cls = 1; name = "高级真元爆发"; nativename = "高级真元爆发"; - icon = "爆气2.dds"; + icon = "爆气2"; max_level = 1; type = 2; apcost = 200; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill2352.cs b/Assets/PerfectWorld/Scripts/Skills/skill2352.cs index 4ac6f493f3..6dd079d3c3 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill2352.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill2352.cs @@ -87,7 +87,7 @@ namespace BrewMonster cls = 0; name = "玄·回马枪"; nativename = "玄·回马枪"; - icon = "回马枪1.dds"; + icon = "回马枪1"; max_level = 1; type = 1; apcost = 0; @@ -109,7 +109,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "1回马枪.sgc"; + effect = "1回马枪"; doenchant = 1; dobless = 0; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill2367.cs b/Assets/PerfectWorld/Scripts/Skills/skill2367.cs index 1dadc1fd61..d62b253fcb 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill2367.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill2367.cs @@ -87,7 +87,7 @@ namespace BrewMonster cls = 0; name = "荒·回马枪"; nativename = "荒·回马枪"; - icon = "回马枪2.dds"; + icon = "回马枪2"; max_level = 1; type = 1; apcost = 0; @@ -109,7 +109,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "2回马枪.sgc"; + effect = "2回马枪"; doenchant = 1; dobless = 0; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill2368.cs b/Assets/PerfectWorld/Scripts/Skills/skill2368.cs index fe419f1b8e..df1e9df64e 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill2368.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill2368.cs @@ -87,7 +87,7 @@ namespace BrewMonster cls = 0; name = "玄·追魂诀"; nativename = "玄·追魂诀"; - icon = "追魂诀1.DDS"; + icon = "追魂诀1"; max_level = 1; type = 1; apcost = 0; @@ -109,7 +109,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "1追魂诀.sgc"; + effect = "1追魂诀"; doenchant = 0; dobless = 1; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill2369.cs b/Assets/PerfectWorld/Scripts/Skills/skill2369.cs index c4790866cc..e4e77e5f66 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill2369.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill2369.cs @@ -87,7 +87,7 @@ namespace BrewMonster cls = 0; name = "荒·追魂诀"; nativename = "荒·追魂诀"; - icon = "追魂诀2.DDS"; + icon = "追魂诀2"; max_level = 1; type = 1; apcost = 0; @@ -109,7 +109,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "2追魂诀.sgc"; + effect = "2追魂诀"; doenchant = 0; dobless = 1; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill2370.cs b/Assets/PerfectWorld/Scripts/Skills/skill2370.cs index de74f6e52f..afd2b67859 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill2370.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill2370.cs @@ -87,7 +87,7 @@ namespace BrewMonster cls = 0; name = "玄·劈星斩月"; nativename = "玄·劈星斩月"; - icon = "玄·劈星斩月.dds"; + icon = "玄·劈星斩月"; max_level = 1; type = 1; apcost = 0; @@ -109,7 +109,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "1流星赶月.sgc"; + effect = "1流星赶月"; doenchant = 1; dobless = 1; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill2371.cs b/Assets/PerfectWorld/Scripts/Skills/skill2371.cs index a5e9807ff3..3ede2b4d68 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill2371.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill2371.cs @@ -87,7 +87,7 @@ namespace BrewMonster cls = 0; name = "荒·劈星斩月"; nativename = "荒·劈星斩月"; - icon = "荒·劈星斩月.dds"; + icon = "荒·劈星斩月"; max_level = 1; type = 1; apcost = 0; @@ -109,7 +109,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "2流星赶月.sgc"; + effect = "2流星赶月"; doenchant = 1; dobless = 1; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill2372.cs b/Assets/PerfectWorld/Scripts/Skills/skill2372.cs index cffeff5edb..20eaee2c14 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill2372.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill2372.cs @@ -87,7 +87,7 @@ namespace BrewMonster cls = 0; name = "玄·破山"; nativename = "玄·破山"; - icon = "玄·破山.dds"; + icon = "玄·破山"; max_level = 1; type = 1; apcost = 0; @@ -109,7 +109,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "1霸王断岳.sgc"; + effect = "1霸王断岳"; doenchant = 1; dobless = 1; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill2373.cs b/Assets/PerfectWorld/Scripts/Skills/skill2373.cs index 83270bda2a..87c62be5e7 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill2373.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill2373.cs @@ -87,7 +87,7 @@ namespace BrewMonster cls = 0; name = "荒·破山"; nativename = "荒·破山"; - icon = "荒·破山.dds"; + icon = "荒·破山"; max_level = 1; type = 1; apcost = 0; @@ -109,7 +109,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "2霸王断岳.sgc"; + effect = "2霸王断岳"; doenchant = 1; dobless = 0; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill2374.cs b/Assets/PerfectWorld/Scripts/Skills/skill2374.cs index 9abff2d05b..926368147d 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill2374.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill2374.cs @@ -88,7 +88,7 @@ namespace BrewMonster cls = 0; name = "玄·升龙破"; nativename = "玄·升龙破"; - icon = "玄·升龙破.DDS"; + icon = "玄·升龙破"; max_level = 1; type = 1; apcost = 100; @@ -110,7 +110,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "1霸王龙飞.sgc"; + effect = "1霸王龙飞"; doenchant = 1; dobless = 1; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill2375.cs b/Assets/PerfectWorld/Scripts/Skills/skill2375.cs index 9b0bc50a81..92249ec197 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill2375.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill2375.cs @@ -88,7 +88,7 @@ namespace BrewMonster cls = 0; name = "荒·升龙破"; nativename = "荒·升龙破"; - icon = "荒·升龙破.DDS"; + icon = "荒·升龙破"; max_level = 1; type = 1; apcost = 100; @@ -110,7 +110,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "2霸王龙飞.sgc"; + effect = "2霸王龙飞"; doenchant = 1; dobless = 0; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill2452.cs b/Assets/PerfectWorld/Scripts/Skills/skill2452.cs index 0f52f2fa99..1f891bdef0 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill2452.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill2452.cs @@ -126,7 +126,7 @@ namespace BrewMonster cls = 1; name = "玄·冰霜烈焰"; nativename = "玄·冰霜烈焰"; - icon = "玄·冰霜烈焰.dds"; + icon = "玄·冰霜烈焰"; max_level = 1; type = 1; apcost = 0; @@ -148,7 +148,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "1凌杀.sgc"; + effect = "1凌杀"; doenchant = 1; dobless = 0; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill2453.cs b/Assets/PerfectWorld/Scripts/Skills/skill2453.cs index 6d11b92622..94c37069a7 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill2453.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill2453.cs @@ -126,7 +126,7 @@ namespace BrewMonster cls = 1; name = "荒·冰霜烈焰"; nativename = "荒·冰霜烈焰"; - icon = "荒·冰霜烈焰.dds"; + icon = "荒·冰霜烈焰"; max_level = 1; type = 1; apcost = 0; @@ -148,7 +148,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "1凌杀.sgc"; + effect = "1凌杀"; doenchant = 1; dobless = 0; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill3.cs b/Assets/PerfectWorld/Scripts/Skills/skill3.cs index 38dae95b38..566029fd68 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill3.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill3.cs @@ -86,7 +86,7 @@ namespace BrewMonster cls = 0; name = "凌风"; nativename = "凌风"; - icon = "凌风.dds"; + icon = "凌风"; max_level = 10; type = 1; apcost = 0; @@ -107,7 +107,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "凌风.sgc"; + effect = "凌风"; doenchant = 1; dobless = 0; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill362.cs b/Assets/PerfectWorld/Scripts/Skills/skill362.cs index 9fac60b92f..c4bae90597 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill362.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill362.cs @@ -81,7 +81,7 @@ namespace BrewMonster cls = 0; name = "仙元爆发"; nativename = "仙元爆发"; - icon = "仙元爆发.dds"; + icon = "仙元爆发"; max_level = 1; type = 2; apcost = 300; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill363.cs b/Assets/PerfectWorld/Scripts/Skills/skill363.cs index 5c3c98016d..da05b3d231 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill363.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill363.cs @@ -81,7 +81,7 @@ namespace BrewMonster cls = 0; name = "魔元爆发"; nativename = "魔元爆发"; - icon = "魔元爆发.dds"; + icon = "魔元爆发"; max_level = 1; type = 2; apcost = 300; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill364.cs b/Assets/PerfectWorld/Scripts/Skills/skill364.cs index 5e1d1d2c4a..14e62daa14 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill364.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill364.cs @@ -81,7 +81,7 @@ namespace BrewMonster cls = 1; name = "仙元爆发"; nativename = "仙元爆发"; - icon = "仙元爆发.dds"; + icon = "仙元爆发"; max_level = 1; type = 2; apcost = 300; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill365.cs b/Assets/PerfectWorld/Scripts/Skills/skill365.cs index a726f8bd53..c987152eb5 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill365.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill365.cs @@ -81,7 +81,7 @@ namespace BrewMonster cls = 1; name = "魔元爆发"; nativename = "魔元爆发"; - icon = "魔元爆发.dds"; + icon = "魔元爆发"; max_level = 1; type = 2; apcost = 300; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill374.cs b/Assets/PerfectWorld/Scripts/Skills/skill374.cs index d9eb548dbb..86db3cdf24 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill374.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill374.cs @@ -87,7 +87,7 @@ namespace BrewMonster cls = 0; name = "真·虎击"; nativename = "真·虎击"; - icon = "虎击1.dds"; + icon = "虎击1"; max_level = 1; type = 1; apcost = 0; @@ -108,7 +108,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "1虎击.sgc"; + effect = "1虎击"; doenchant = 0; dobless = 1; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill375.cs b/Assets/PerfectWorld/Scripts/Skills/skill375.cs index 13ad42231e..7937986dab 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill375.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill375.cs @@ -87,7 +87,7 @@ namespace BrewMonster cls = 0; name = "狂·虎击"; nativename = "狂·虎击"; - icon = "虎击2.dds"; + icon = "虎击2"; max_level = 1; type = 1; apcost = 0; @@ -108,7 +108,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "2虎击.sgc"; + effect = "2虎击"; doenchant = 0; dobless = 0; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill376.cs b/Assets/PerfectWorld/Scripts/Skills/skill376.cs index 11d1b66490..ff6537dec3 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill376.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill376.cs @@ -87,7 +87,7 @@ namespace BrewMonster cls = 0; name = "真·寸力"; nativename = "真·寸力"; - icon = "寸力1.dds"; + icon = "寸力1"; max_level = 1; type = 1; apcost = 0; @@ -109,7 +109,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "1寸力.sgc"; + effect = "1寸力"; doenchant = 1; dobless = 0; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill377.cs b/Assets/PerfectWorld/Scripts/Skills/skill377.cs index 052209184e..d4d9fbffd2 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill377.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill377.cs @@ -87,7 +87,7 @@ namespace BrewMonster cls = 0; name = "狂·寸力"; nativename = "狂·寸力"; - icon = "寸力2.dds"; + icon = "寸力2"; max_level = 1; type = 1; apcost = 0; @@ -109,7 +109,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "2寸力.sgc"; + effect = "2寸力"; doenchant = 1; dobless = 0; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill378.cs b/Assets/PerfectWorld/Scripts/Skills/skill378.cs index 0b4de6dddf..9c8b4f274b 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill378.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill378.cs @@ -87,7 +87,7 @@ namespace BrewMonster cls = 0; name = "真·流水"; nativename = "真·流水"; - icon = "流水1.dds"; + icon = "流水1"; max_level = 1; type = 1; apcost = 20; @@ -108,7 +108,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "1流水.sgc"; + effect = "1流水"; doenchant = 0; dobless = 0; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill379.cs b/Assets/PerfectWorld/Scripts/Skills/skill379.cs index abb4a11b08..c9c1bff2a8 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill379.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill379.cs @@ -87,7 +87,7 @@ namespace BrewMonster cls = 0; name = "狂·流水"; nativename = "狂·流水"; - icon = "流水2.dds"; + icon = "流水2"; max_level = 1; type = 1; apcost = 30; @@ -108,7 +108,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "2流水.sgc"; + effect = "2流水"; doenchant = 0; dobless = 1; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill380.cs b/Assets/PerfectWorld/Scripts/Skills/skill380.cs index 1205cf8499..9187777374 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill380.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill380.cs @@ -87,7 +87,7 @@ namespace BrewMonster cls = 0; name = "真·凌风"; nativename = "真·凌风"; - icon = "凌风1.dds"; + icon = "凌风1"; max_level = 1; type = 1; apcost = 0; @@ -108,7 +108,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "1凌风.sgc"; + effect = "1凌风"; doenchant = 1; dobless = 0; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill381.cs b/Assets/PerfectWorld/Scripts/Skills/skill381.cs index 0d39acc87d..bd94a05fb5 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill381.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill381.cs @@ -87,7 +87,7 @@ namespace BrewMonster cls = 0; name = "狂·凌风"; nativename = "狂·凌风"; - icon = "凌风2.dds"; + icon = "凌风2"; max_level = 1; type = 1; apcost = 0; @@ -108,7 +108,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "2凌风.sgc"; + effect = "2凌风"; doenchant = 1; dobless = 0; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill382.cs b/Assets/PerfectWorld/Scripts/Skills/skill382.cs index fd9c4d81ca..7e14124347 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill382.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill382.cs @@ -87,7 +87,7 @@ namespace BrewMonster cls = 0; name = "真·龙现"; nativename = "真·龙现"; - icon = "龙现1.dds"; + icon = "龙现1"; max_level = 1; type = 1; apcost = 0; @@ -108,7 +108,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "1龙现.sgc"; + effect = "1龙现"; doenchant = 0; dobless = 0; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill383.cs b/Assets/PerfectWorld/Scripts/Skills/skill383.cs index b803317cdb..a107353b07 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill383.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill383.cs @@ -87,7 +87,7 @@ namespace BrewMonster cls = 0; name = "狂·龙现"; nativename = "狂·龙现"; - icon = "龙现2.dds"; + icon = "龙现2"; max_level = 1; type = 1; apcost = 0; @@ -108,7 +108,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "2龙现.sgc"; + effect = "2龙现"; doenchant = 0; dobless = 0; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill384.cs b/Assets/PerfectWorld/Scripts/Skills/skill384.cs index 5af03f498e..a06416cf94 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill384.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill384.cs @@ -87,7 +87,7 @@ namespace BrewMonster cls = 0; name = "真·断岩斩"; nativename = "真·断岩斩"; - icon = "断岩斩1.dds"; + icon = "断岩斩1"; max_level = 1; type = 1; apcost = 0; @@ -108,7 +108,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "1断岩斩.sgc"; + effect = "1断岩斩"; doenchant = 1; dobless = 0; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill385.cs b/Assets/PerfectWorld/Scripts/Skills/skill385.cs index 4adfdb9bb0..58842cef53 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill385.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill385.cs @@ -87,7 +87,7 @@ namespace BrewMonster cls = 0; name = "狂·断岩斩"; nativename = "狂·断岩斩"; - icon = "断岩斩2.dds"; + icon = "断岩斩2"; max_level = 1; type = 1; apcost = 0; @@ -108,7 +108,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "2断岩斩.sgc"; + effect = "2断岩斩"; doenchant = 1; dobless = 0; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill386.cs b/Assets/PerfectWorld/Scripts/Skills/skill386.cs index b38e77e201..9d13e93a34 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill386.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill386.cs @@ -87,7 +87,7 @@ namespace BrewMonster cls = 0; name = "真·狂龙斩"; nativename = "真·狂龙斩"; - icon = "狂龙斩1.dds"; + icon = "狂龙斩1"; max_level = 1; type = 1; apcost = 0; @@ -108,7 +108,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "1狂龙斩.sgc"; + effect = "1狂龙斩"; doenchant = 0; dobless = 0; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill387.cs b/Assets/PerfectWorld/Scripts/Skills/skill387.cs index b07591f401..144484eaae 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill387.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill387.cs @@ -87,7 +87,7 @@ namespace BrewMonster cls = 0; name = "狂·狂龙斩"; nativename = "狂·狂龙斩"; - icon = "狂龙斩2.dds"; + icon = "狂龙斩2"; max_level = 1; type = 1; apcost = 0; @@ -108,7 +108,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "2狂龙斩.sgc"; + effect = "2狂龙斩"; doenchant = 0; dobless = 0; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill388.cs b/Assets/PerfectWorld/Scripts/Skills/skill388.cs index a1c96e6811..220a71bbc8 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill388.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill388.cs @@ -87,7 +87,7 @@ namespace BrewMonster cls = 0; name = "真·横扫千军"; nativename = "真·横扫千军"; - icon = "横扫千军1.dds"; + icon = "横扫千军1"; max_level = 1; type = 1; apcost = 0; @@ -108,7 +108,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "1横扫千军.sgc"; + effect = "1横扫千军"; doenchant = 0; dobless = 0; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill389.cs b/Assets/PerfectWorld/Scripts/Skills/skill389.cs index cafae4b052..ec84263177 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill389.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill389.cs @@ -87,7 +87,7 @@ namespace BrewMonster cls = 0; name = "狂·横扫千军"; nativename = "狂·横扫千军"; - icon = "横扫千军2.dds"; + icon = "横扫千军2"; max_level = 1; type = 1; apcost = 0; @@ -108,7 +108,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "2横扫千军.sgc"; + effect = "2横扫千军"; doenchant = 0; dobless = 1; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill390.cs b/Assets/PerfectWorld/Scripts/Skills/skill390.cs index 6626b60838..5118f282aa 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill390.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill390.cs @@ -87,7 +87,7 @@ namespace BrewMonster cls = 0; name = "真·劈空掌"; nativename = "真·劈空掌"; - icon = "劈空掌1.dds"; + icon = "劈空掌1"; max_level = 1; type = 1; apcost = 100; @@ -108,7 +108,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "1劈空掌.sgc"; + effect = "1劈空掌"; doenchant = 1; dobless = 1; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill391.cs b/Assets/PerfectWorld/Scripts/Skills/skill391.cs index 1265f85ec1..d539322c6c 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill391.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill391.cs @@ -87,7 +87,7 @@ namespace BrewMonster cls = 0; name = "狂·劈空掌"; nativename = "狂·劈空掌"; - icon = "劈空掌2.dds"; + icon = "劈空掌2"; max_level = 1; type = 1; apcost = 100; @@ -108,7 +108,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "2劈空掌.sgc"; + effect = "2劈空掌"; doenchant = 1; dobless = 0; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill392.cs b/Assets/PerfectWorld/Scripts/Skills/skill392.cs index 44a6051064..bc0b63ebde 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill392.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill392.cs @@ -87,7 +87,7 @@ namespace BrewMonster cls = 0; name = "真·无影脚"; nativename = "真·无影脚"; - icon = "无影脚1.dds"; + icon = "无影脚1"; max_level = 1; type = 1; apcost = 0; @@ -108,7 +108,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "1无影脚.sgc"; + effect = "1无影脚"; doenchant = 1; dobless = 0; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill393.cs b/Assets/PerfectWorld/Scripts/Skills/skill393.cs index c03e0cdd06..c0b1b2fc5e 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill393.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill393.cs @@ -87,7 +87,7 @@ namespace BrewMonster cls = 0; name = "狂·无影脚"; nativename = "狂·无影脚"; - icon = "无影脚2.dds"; + icon = "无影脚2"; max_level = 1; type = 1; apcost = 0; @@ -108,7 +108,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "2无影脚.sgc"; + effect = "2无影脚"; doenchant = 1; dobless = 0; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill394.cs b/Assets/PerfectWorld/Scripts/Skills/skill394.cs index 0ad29e0718..8e25eb58f6 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill394.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill394.cs @@ -87,7 +87,7 @@ namespace BrewMonster cls = 0; name = "真·风卷残云"; nativename = "真·风卷残云"; - icon = "风卷残云1.dds"; + icon = "风卷残云1"; max_level = 1; type = 1; apcost = 0; @@ -108,7 +108,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "1风卷残云.sgc"; + effect = "1风卷残云"; doenchant = 0; dobless = 1; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill395.cs b/Assets/PerfectWorld/Scripts/Skills/skill395.cs index 95ccca7de2..39969b3b01 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill395.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill395.cs @@ -87,7 +87,7 @@ namespace BrewMonster cls = 0; name = "狂·风卷残云"; nativename = "狂·风卷残云"; - icon = "风卷残云2.dds"; + icon = "风卷残云2"; max_level = 1; type = 1; apcost = 0; @@ -108,7 +108,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "2风卷残云.sgc"; + effect = "2风卷残云"; doenchant = 0; dobless = 1; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill396.cs b/Assets/PerfectWorld/Scripts/Skills/skill396.cs index 07ccedbad9..50fee9d8a2 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill396.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill396.cs @@ -87,7 +87,7 @@ namespace BrewMonster cls = 0; name = "真·云龙九现"; nativename = "真·云龙九现"; - icon = "云龙九现1.dds"; + icon = "云龙九现1"; max_level = 1; type = 1; apcost = 200; @@ -108,7 +108,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "1云龙九现.sgc"; + effect = "1云龙九现"; doenchant = 1; dobless = 1; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill397.cs b/Assets/PerfectWorld/Scripts/Skills/skill397.cs index dd6ca4cde3..27da6f06f7 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill397.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill397.cs @@ -87,7 +87,7 @@ namespace BrewMonster cls = 0; name = "狂·云龙九现"; nativename = "狂·云龙九现"; - icon = "云龙九现2.dds"; + icon = "云龙九现2"; max_level = 1; type = 1; apcost = 200; @@ -108,7 +108,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "2云龙九现.sgc"; + effect = "2云龙九现"; doenchant = 0; dobless = 1; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill398.cs b/Assets/PerfectWorld/Scripts/Skills/skill398.cs index a016f15605..ec1e7f0f0f 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill398.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill398.cs @@ -87,7 +87,7 @@ namespace BrewMonster cls = 0; name = "真·疾风刺"; nativename = "真·疾风刺"; - icon = "疾风刺1.DDS"; + icon = "疾风刺1"; max_level = 1; type = 1; apcost = 100; @@ -109,7 +109,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "1疾风霹雳.sgc"; + effect = "1疾风霹雳"; doenchant = 1; dobless = 1; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill399.cs b/Assets/PerfectWorld/Scripts/Skills/skill399.cs index 8a2874b0c6..3dced45601 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill399.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill399.cs @@ -87,7 +87,7 @@ namespace BrewMonster cls = 0; name = "狂·疾风刺"; nativename = "狂·疾风刺"; - icon = "疾风刺2.dds"; + icon = "疾风刺2"; max_level = 1; type = 1; apcost = 100; @@ -109,7 +109,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "2疾风霹雳.sgc"; + effect = "2疾风霹雳"; doenchant = 1; dobless = 0; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill4.cs b/Assets/PerfectWorld/Scripts/Skills/skill4.cs index 5156d599e4..fb193c3f6f 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill4.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill4.cs @@ -83,7 +83,7 @@ namespace BrewMonster cls = 0; name = "狮子吼"; nativename = "狮子吼"; - icon = "狮子吼.dds"; + icon = "狮子吼"; max_level = 10; type = 3; apcost = 35; @@ -104,7 +104,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "狮子吼.sgc"; + effect = "狮子吼"; doenchant = 1; dobless = 0; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill400.cs b/Assets/PerfectWorld/Scripts/Skills/skill400.cs index c744caa8b8..2e8cc944df 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill400.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill400.cs @@ -87,7 +87,7 @@ namespace BrewMonster cls = 0; name = "真·回马枪"; nativename = "真·回马枪"; - icon = "回马枪1.dds"; + icon = "回马枪1"; max_level = 1; type = 1; apcost = 0; @@ -108,7 +108,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "1回马枪.sgc"; + effect = "1回马枪"; doenchant = 0; dobless = 0; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill401.cs b/Assets/PerfectWorld/Scripts/Skills/skill401.cs index 1f0ceccca2..69c24945e1 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill401.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill401.cs @@ -87,7 +87,7 @@ namespace BrewMonster cls = 0; name = "狂·回马枪"; nativename = "狂·回马枪"; - icon = "回马枪2.dds"; + icon = "回马枪2"; max_level = 1; type = 1; apcost = 0; @@ -108,7 +108,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "2回马枪.sgc"; + effect = "2回马枪"; doenchant = 0; dobless = 0; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill402.cs b/Assets/PerfectWorld/Scripts/Skills/skill402.cs index ca6e8ea598..dbb296eafe 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill402.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill402.cs @@ -87,7 +87,7 @@ namespace BrewMonster cls = 0; name = "真·流星赶月"; nativename = "真·流星赶月"; - icon = "流星赶月1.dds"; + icon = "流星赶月1"; max_level = 1; type = 1; apcost = 0; @@ -108,7 +108,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "1流星赶月.sgc"; + effect = "1流星赶月"; doenchant = 1; dobless = 0; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill403.cs b/Assets/PerfectWorld/Scripts/Skills/skill403.cs index 44cf5278a1..aa90cc70fe 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill403.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill403.cs @@ -87,7 +87,7 @@ namespace BrewMonster cls = 0; name = "狂·流星赶月"; nativename = "狂·流星赶月"; - icon = "流星赶月2.dds"; + icon = "流星赶月2"; max_level = 1; type = 1; apcost = 0; @@ -108,7 +108,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "2流星赶月.sgc"; + effect = "2流星赶月"; doenchant = 1; dobless = 0; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill404.cs b/Assets/PerfectWorld/Scripts/Skills/skill404.cs index 9bc7c03bbe..14e694dcb0 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill404.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill404.cs @@ -87,7 +87,7 @@ namespace BrewMonster cls = 0; name = "真·寒冰刃域"; nativename = "真·寒冰刃域"; - icon = "寒冰刃域1.DDS"; + icon = "寒冰刃域1"; max_level = 1; type = 1; apcost = 200; @@ -108,7 +108,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "1刃域.sgc"; + effect = "1刃域"; doenchant = 1; dobless = 1; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill405.cs b/Assets/PerfectWorld/Scripts/Skills/skill405.cs index 863bef8fe7..56baf1c956 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill405.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill405.cs @@ -87,7 +87,7 @@ namespace BrewMonster cls = 0; name = "狂·寒冰刃域"; nativename = "狂·寒冰刃域"; - icon = "寒冰刃域.dds"; + icon = "寒冰刃域"; max_level = 1; type = 1; apcost = 200; @@ -108,7 +108,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "2刃域.sgc"; + effect = "2刃域"; doenchant = 1; dobless = 1; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill406.cs b/Assets/PerfectWorld/Scripts/Skills/skill406.cs index d0a571ba54..3a11451753 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill406.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill406.cs @@ -88,7 +88,7 @@ namespace BrewMonster cls = 0; name = "真·龙飞击"; nativename = "真·龙飞击"; - icon = "龙飞击1.DDS"; + icon = "龙飞击1"; max_level = 1; type = 1; apcost = 100; @@ -109,7 +109,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "1霸王龙飞.sgc"; + effect = "1霸王龙飞"; doenchant = 1; dobless = 1; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill407.cs b/Assets/PerfectWorld/Scripts/Skills/skill407.cs index d434518d0a..01885ce49d 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill407.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill407.cs @@ -88,7 +88,7 @@ namespace BrewMonster cls = 0; name = "狂·龙飞击"; nativename = "狂·龙飞击"; - icon = "龙飞击2.DDS"; + icon = "龙飞击2"; max_level = 1; type = 1; apcost = 100; @@ -109,7 +109,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "2霸王龙飞.sgc"; + effect = "2霸王龙飞"; doenchant = 1; dobless = 0; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill408.cs b/Assets/PerfectWorld/Scripts/Skills/skill408.cs index b641a04c1b..df120a8821 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill408.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill408.cs @@ -87,7 +87,7 @@ namespace BrewMonster cls = 0; name = "真·断岳扫"; nativename = "真·断岳扫"; - icon = "断岳扫1.DDS"; + icon = "断岳扫1"; max_level = 1; type = 1; apcost = 0; @@ -108,7 +108,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "1霸王断岳.sgc"; + effect = "1霸王断岳"; doenchant = 0; dobless = 1; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill409.cs b/Assets/PerfectWorld/Scripts/Skills/skill409.cs index 52374b87ba..d8165f1e13 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill409.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill409.cs @@ -87,7 +87,7 @@ namespace BrewMonster cls = 0; name = "狂·断岳扫"; nativename = "狂·断岳扫"; - icon = "断岳扫2.DDS"; + icon = "断岳扫2"; max_level = 1; type = 1; apcost = 0; @@ -108,7 +108,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "2霸王断岳.sgc"; + effect = "2霸王断岳"; doenchant = 0; dobless = 1; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill410.cs b/Assets/PerfectWorld/Scripts/Skills/skill410.cs index d42c81a88d..c8abe1c305 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill410.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill410.cs @@ -87,7 +87,7 @@ namespace BrewMonster cls = 0; name = "真·裂岩炎震"; nativename = "真·裂岩炎震"; - icon = "裂岩炎震1.DDS"; + icon = "裂岩炎震1"; max_level = 1; type = 1; apcost = 0; @@ -108,7 +108,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "1霸王暴怒.sgc"; + effect = "1霸王暴怒"; doenchant = 1; dobless = 0; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill411.cs b/Assets/PerfectWorld/Scripts/Skills/skill411.cs index a4dbe51b55..e7a479ce5d 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill411.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill411.cs @@ -87,7 +87,7 @@ namespace BrewMonster cls = 0; name = "狂·裂岩炎震"; nativename = "狂·裂岩炎震"; - icon = "裂岩炎震2.dds"; + icon = "裂岩炎震2"; max_level = 1; type = 1; apcost = 0; @@ -108,7 +108,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "2霸王暴怒.sgc"; + effect = "2霸王暴怒"; doenchant = 1; dobless = 0; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill412.cs b/Assets/PerfectWorld/Scripts/Skills/skill412.cs index 13f16c7a2a..f6dd0bcb40 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill412.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill412.cs @@ -87,7 +87,7 @@ namespace BrewMonster cls = 0; name = "真·天火狂龙"; nativename = "真·天火狂龙"; - icon = "天火狂龙1.dds"; + icon = "天火狂龙1"; max_level = 1; type = 1; apcost = 200; @@ -108,7 +108,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "1霸王献鼎.sgc"; + effect = "1霸王献鼎"; doenchant = 1; dobless = 1; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill413.cs b/Assets/PerfectWorld/Scripts/Skills/skill413.cs index 7db3c5f3bc..107533b1d2 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill413.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill413.cs @@ -87,7 +87,7 @@ namespace BrewMonster cls = 0; name = "狂·天火狂龙"; nativename = "狂·天火狂龙"; - icon = "天火狂龙2.dds"; + icon = "天火狂龙2"; max_level = 1; type = 1; apcost = 200; @@ -108,7 +108,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "2霸王献鼎.sgc"; + effect = "2霸王献鼎"; doenchant = 1; dobless = 0; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill414.cs b/Assets/PerfectWorld/Scripts/Skills/skill414.cs index e8bb4b572e..3787466df1 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill414.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill414.cs @@ -87,7 +87,7 @@ namespace BrewMonster cls = 0; name = "真·忘情式"; nativename = "真·忘情式"; - icon = "忘情式1.dds"; + icon = "忘情式1"; max_level = 1; type = 1; apcost = 100; @@ -109,7 +109,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "1忘情式.sgc"; + effect = "1忘情式"; doenchant = 1; dobless = 1; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill415.cs b/Assets/PerfectWorld/Scripts/Skills/skill415.cs index 5fd834799c..6104f71934 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill415.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill415.cs @@ -87,7 +87,7 @@ namespace BrewMonster cls = 0; name = "狂·忘情式"; nativename = "狂·忘情式"; - icon = "忘情式2.dds"; + icon = "忘情式2"; max_level = 1; type = 1; apcost = 100; @@ -109,7 +109,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "2忘情式.sgc"; + effect = "2忘情式"; doenchant = 1; dobless = 0; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill416.cs b/Assets/PerfectWorld/Scripts/Skills/skill416.cs index fd037961b7..83540b165d 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill416.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill416.cs @@ -88,7 +88,7 @@ namespace BrewMonster cls = 0; name = "真·追魂诀"; nativename = "真·追魂诀"; - icon = "追魂诀1.DDS"; + icon = "追魂诀1"; max_level = 1; type = 1; apcost = 0; @@ -109,7 +109,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "1追魂诀.sgc"; + effect = "1追魂诀"; doenchant = 0; dobless = 0; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill417.cs b/Assets/PerfectWorld/Scripts/Skills/skill417.cs index a37bb695ab..17d257f8c7 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill417.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill417.cs @@ -88,7 +88,7 @@ namespace BrewMonster cls = 0; name = "狂·追魂诀"; nativename = "狂·追魂诀"; - icon = "追魂诀2.dds"; + icon = "追魂诀2"; max_level = 1; type = 1; apcost = 0; @@ -109,7 +109,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "2追魂诀.sgc"; + effect = "2追魂诀"; doenchant = 0; dobless = 1; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill418.cs b/Assets/PerfectWorld/Scripts/Skills/skill418.cs index d0d8235475..732ef15913 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill418.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill418.cs @@ -87,7 +87,7 @@ namespace BrewMonster cls = 0; name = "真·剑气纵横"; nativename = "真·剑气纵横"; - icon = "剑气纵横1.dds"; + icon = "剑气纵横1"; max_level = 1; type = 1; apcost = 0; @@ -108,7 +108,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "1剑气纵横.sgc"; + effect = "1剑气纵横"; doenchant = 1; dobless = 1; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill419.cs b/Assets/PerfectWorld/Scripts/Skills/skill419.cs index 12d6f63f98..41f4e1f278 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill419.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill419.cs @@ -87,7 +87,7 @@ namespace BrewMonster cls = 0; name = "狂·剑气纵横"; nativename = "狂·剑气纵横"; - icon = "剑气纵横2.dds"; + icon = "剑气纵横2"; max_level = 1; type = 1; apcost = 0; @@ -108,7 +108,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "2剑气纵横.sgc"; + effect = "2剑气纵横"; doenchant = 1; dobless = 0; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill420.cs b/Assets/PerfectWorld/Scripts/Skills/skill420.cs index 0e298682a3..ae25b3ff2d 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill420.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill420.cs @@ -87,7 +87,7 @@ namespace BrewMonster cls = 0; name = "真·万剑诀"; nativename = "真·万剑诀"; - icon = "万剑诀1.dds"; + icon = "万剑诀1"; max_level = 1; type = 1; apcost = 100; @@ -109,7 +109,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "1万剑诀.sgc"; + effect = "1万剑诀"; doenchant = 1; dobless = 1; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill421.cs b/Assets/PerfectWorld/Scripts/Skills/skill421.cs index 5d076c368b..d0c91238a9 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill421.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill421.cs @@ -87,7 +87,7 @@ namespace BrewMonster cls = 0; name = "狂·万剑诀"; nativename = "狂·万剑诀"; - icon = "万剑诀2.dds"; + icon = "万剑诀2"; max_level = 1; type = 1; apcost = 100; @@ -109,7 +109,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "2万剑诀.sgc"; + effect = "2万剑诀"; doenchant = 1; dobless = 0; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill422.cs b/Assets/PerfectWorld/Scripts/Skills/skill422.cs index d0231fad31..dbe52697d2 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill422.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill422.cs @@ -84,7 +84,7 @@ namespace BrewMonster cls = 0; name = "真·金钟罩"; nativename = "真·金钟罩"; - icon = "金钟罩1.dds"; + icon = "金钟罩1"; max_level = 1; type = 2; apcost = 0; @@ -105,7 +105,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "1金钟罩.sgc"; + effect = "1金钟罩"; doenchant = 1; dobless = 0; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill423.cs b/Assets/PerfectWorld/Scripts/Skills/skill423.cs index d817cc4531..c7ef17838c 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill423.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill423.cs @@ -84,7 +84,7 @@ namespace BrewMonster cls = 0; name = "狂·金钟罩"; nativename = "狂·金钟罩"; - icon = "金钟罩2.dds"; + icon = "金钟罩2"; max_level = 1; type = 2; apcost = 0; @@ -105,7 +105,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "2金钟罩.sgc"; + effect = "2金钟罩"; doenchant = 1; dobless = 0; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill424.cs b/Assets/PerfectWorld/Scripts/Skills/skill424.cs index 3913d82ec7..0a351d5598 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill424.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill424.cs @@ -84,7 +84,7 @@ namespace BrewMonster cls = 0; name = "真·狮子吼"; nativename = "真·狮子吼"; - icon = "狮子吼1.dds"; + icon = "狮子吼1"; max_level = 1; type = 3; apcost = 20; @@ -106,7 +106,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "狮子吼.sgc"; + effect = "狮子吼"; doenchant = 1; dobless = 0; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill425.cs b/Assets/PerfectWorld/Scripts/Skills/skill425.cs index f311afe5cf..2e183ff454 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill425.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill425.cs @@ -84,7 +84,7 @@ namespace BrewMonster cls = 0; name = "狂·狮子吼"; nativename = "狂·狮子吼"; - icon = "狮子吼2.dds"; + icon = "狮子吼2"; max_level = 1; type = 3; apcost = 35; @@ -105,7 +105,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "2狮子吼.sgc"; + effect = "2狮子吼"; doenchant = 1; dobless = 0; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill426.cs b/Assets/PerfectWorld/Scripts/Skills/skill426.cs index fd7d9af9a4..a27b4d4c2c 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill426.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill426.cs @@ -50,7 +50,7 @@ namespace BrewMonster cls = 0; name = "真·易筋经"; nativename = "真·易筋经"; - icon = "易筋经1.DDS"; + icon = "易筋经1"; max_level = 1; type = 2; apcost = 0; @@ -71,7 +71,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "1易筋经.sgc"; + effect = "1易筋经"; doenchant = 1; dobless = 0; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill427.cs b/Assets/PerfectWorld/Scripts/Skills/skill427.cs index 7025899a14..590d3ee948 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill427.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill427.cs @@ -50,7 +50,7 @@ namespace BrewMonster cls = 0; name = "狂·易筋经"; nativename = "狂·易筋经"; - icon = "易筋经2.DDS"; + icon = "易筋经2"; max_level = 1; type = 2; apcost = 0; @@ -71,7 +71,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "2易筋经.sgc"; + effect = "2易筋经"; doenchant = 1; dobless = 0; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill428.cs b/Assets/PerfectWorld/Scripts/Skills/skill428.cs index b56faddf10..c113f766c8 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill428.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill428.cs @@ -50,7 +50,7 @@ namespace BrewMonster cls = 0; name = "真·易髓经"; nativename = "真·易髓经"; - icon = "易髓经1.dds"; + icon = "易髓经1"; max_level = 1; type = 2; apcost = 0; @@ -71,7 +71,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "1易髓经.sgc"; + effect = "1易髓经"; doenchant = 1; dobless = 0; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill429.cs b/Assets/PerfectWorld/Scripts/Skills/skill429.cs index 28f7491cb1..6d515591ea 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill429.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill429.cs @@ -50,7 +50,7 @@ namespace BrewMonster cls = 0; name = "狂·易髓经"; nativename = "狂·易髓经"; - icon = "易髓经2.dds"; + icon = "易髓经2"; max_level = 1; type = 2; apcost = 0; @@ -71,7 +71,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "2易髓经.sgc"; + effect = "2易髓经"; doenchant = 1; dobless = 0; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill430.cs b/Assets/PerfectWorld/Scripts/Skills/skill430.cs index 412a9ca995..d690faf7c8 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill430.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill430.cs @@ -50,7 +50,7 @@ namespace BrewMonster cls = 0; name = "真·金刚经"; nativename = "真·金刚经"; - icon = "金刚经1.dds"; + icon = "金刚经1"; max_level = 1; type = 2; apcost = 100; @@ -71,7 +71,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "1金刚经.sgc"; + effect = "1金刚经"; doenchant = 1; dobless = 0; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill431.cs b/Assets/PerfectWorld/Scripts/Skills/skill431.cs index 65d4f24362..209752bb86 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill431.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill431.cs @@ -50,7 +50,7 @@ namespace BrewMonster cls = 0; name = "狂·金刚经"; nativename = "狂·金刚经"; - icon = "金刚经2.dds"; + icon = "金刚经2"; max_level = 1; type = 2; apcost = 100; @@ -71,7 +71,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "2金刚经.sgc"; + effect = "2金刚经"; doenchant = 1; dobless = 0; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill432.cs b/Assets/PerfectWorld/Scripts/Skills/skill432.cs index 98971e856d..26022a7db0 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill432.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill432.cs @@ -32,7 +32,7 @@ namespace BrewMonster cls = 0; name = "真·刀剑精通"; nativename = "真·刀剑精通"; - icon = "刀剑精通1.dds"; + icon = "刀剑精通1"; max_level = 1; type = 5; apcost = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill433.cs b/Assets/PerfectWorld/Scripts/Skills/skill433.cs index 003aa93efb..164051aa60 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill433.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill433.cs @@ -32,7 +32,7 @@ namespace BrewMonster cls = 0; name = "狂·刀剑精通"; nativename = "狂·刀剑精通"; - icon = "刀剑精通2.dds"; + icon = "刀剑精通2"; max_level = 1; type = 5; apcost = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill434.cs b/Assets/PerfectWorld/Scripts/Skills/skill434.cs index 1ab5d387b3..54ca7c921a 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill434.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill434.cs @@ -32,7 +32,7 @@ namespace BrewMonster cls = 0; name = "真·长兵精通"; nativename = "真·长兵精通"; - icon = "长兵精通1.dds"; + icon = "长兵精通1"; max_level = 1; type = 5; apcost = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill435.cs b/Assets/PerfectWorld/Scripts/Skills/skill435.cs index 7de551ec65..a19ea312c6 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill435.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill435.cs @@ -32,7 +32,7 @@ namespace BrewMonster cls = 0; name = "狂·长兵精通"; nativename = "狂·长兵精通"; - icon = "长兵精通2.dds"; + icon = "长兵精通2"; max_level = 1; type = 5; apcost = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill436.cs b/Assets/PerfectWorld/Scripts/Skills/skill436.cs index dbe07b67c9..68de001752 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill436.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill436.cs @@ -32,7 +32,7 @@ namespace BrewMonster cls = 0; name = "真·斧锤精通"; nativename = "真·斧锤精通"; - icon = "斧锤精通1.dds"; + icon = "斧锤精通1"; max_level = 1; type = 5; apcost = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill437.cs b/Assets/PerfectWorld/Scripts/Skills/skill437.cs index fc71eeee8c..9e442cc1a0 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill437.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill437.cs @@ -32,7 +32,7 @@ namespace BrewMonster cls = 0; name = "真·拳术精通"; nativename = "真·拳术精通"; - icon = "拳术精通1.dds"; + icon = "拳术精通1"; max_level = 1; type = 5; apcost = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill438.cs b/Assets/PerfectWorld/Scripts/Skills/skill438.cs index 5b39f4f20e..6d8cb7b32b 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill438.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill438.cs @@ -32,7 +32,7 @@ namespace BrewMonster cls = 0; name = "狂·拳术精通"; nativename = "狂·拳术精通"; - icon = "拳术精通2.dds"; + icon = "拳术精通2"; max_level = 1; type = 5; apcost = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill439.cs b/Assets/PerfectWorld/Scripts/Skills/skill439.cs index 6f6038ed73..847bdaf5b3 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill439.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill439.cs @@ -32,7 +32,7 @@ namespace BrewMonster cls = 0; name = "狂·斧锤精通"; nativename = "狂·斧锤精通"; - icon = "斧锤精通2.dds"; + icon = "斧锤精通2"; max_level = 1; type = 5; apcost = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill440.cs b/Assets/PerfectWorld/Scripts/Skills/skill440.cs index d635b94063..a42d3388a1 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill440.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill440.cs @@ -87,7 +87,7 @@ namespace BrewMonster cls = 1; name = "真·烈火符"; nativename = "真·烈火符"; - icon = "烈火符1.dds"; + icon = "烈火符1"; max_level = 1; type = 1; apcost = 0; @@ -108,7 +108,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "1烈火符.sgc"; + effect = "1烈火符"; doenchant = 0; dobless = 1; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill441.cs b/Assets/PerfectWorld/Scripts/Skills/skill441.cs index baf95f8808..2b6f9ef380 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill441.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill441.cs @@ -87,7 +87,7 @@ namespace BrewMonster cls = 1; name = "狂·烈火符"; nativename = "狂·烈火符"; - icon = "烈火符2.dds"; + icon = "烈火符2"; max_level = 1; type = 1; apcost = 0; @@ -108,7 +108,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "2烈火符.sgc"; + effect = "2烈火符"; doenchant = 0; dobless = 0; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill442.cs b/Assets/PerfectWorld/Scripts/Skills/skill442.cs index faee174a4f..117fcc6212 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill442.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill442.cs @@ -84,7 +84,7 @@ namespace BrewMonster cls = 1; name = "真·烈焰护甲"; nativename = "真·烈焰护甲"; - icon = "烈焰护甲1.dds"; + icon = "烈焰护甲1"; max_level = 1; type = 2; apcost = 30; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill443.cs b/Assets/PerfectWorld/Scripts/Skills/skill443.cs index fdfca10008..81137f2607 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill443.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill443.cs @@ -84,7 +84,7 @@ namespace BrewMonster cls = 1; name = "狂·烈焰护甲"; nativename = "狂·烈焰护甲"; - icon = "烈焰护甲2.dds"; + icon = "烈焰护甲2"; max_level = 1; type = 2; apcost = 30; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill444.cs b/Assets/PerfectWorld/Scripts/Skills/skill444.cs index 49037c2e3a..b68eafb430 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill444.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill444.cs @@ -87,7 +87,7 @@ namespace BrewMonster cls = 1; name = "真·火煞天灯"; nativename = "真·火煞天灯"; - icon = "火煞天灯1.dds"; + icon = "火煞天灯1"; max_level = 1; type = 1; apcost = 0; @@ -109,7 +109,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "1火煞天灯.sgc"; + effect = "1火煞天灯"; doenchant = 1; dobless = 0; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill445.cs b/Assets/PerfectWorld/Scripts/Skills/skill445.cs index 4bdf56b2c2..ea66244f90 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill445.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill445.cs @@ -87,7 +87,7 @@ namespace BrewMonster cls = 1; name = "狂·火煞天灯"; nativename = "狂·火煞天灯"; - icon = "火煞天灯2.dds"; + icon = "火煞天灯2"; max_level = 1; type = 1; apcost = 0; @@ -109,7 +109,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "火煞天灯.sgc"; + effect = "火煞天灯"; doenchant = 1; dobless = 0; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill446.cs b/Assets/PerfectWorld/Scripts/Skills/skill446.cs index ef61dc30be..24a9f34eec 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill446.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill446.cs @@ -87,7 +87,7 @@ namespace BrewMonster cls = 1; name = "真·神火符"; nativename = "真·神火符"; - icon = "神火符1.dds"; + icon = "神火符1"; max_level = 1; type = 1; apcost = 0; @@ -108,7 +108,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "1神火符.sgc"; + effect = "1神火符"; doenchant = 1; dobless = 0; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill447.cs b/Assets/PerfectWorld/Scripts/Skills/skill447.cs index bd4bc877ae..a8abf5d540 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill447.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill447.cs @@ -87,7 +87,7 @@ namespace BrewMonster cls = 1; name = "狂·神火符"; nativename = "狂·神火符"; - icon = "神火符2.dds"; + icon = "神火符2"; max_level = 1; type = 1; apcost = 0; @@ -108,7 +108,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "2神火符.sgc"; + effect = "2神火符"; doenchant = 0; dobless = 0; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill448.cs b/Assets/PerfectWorld/Scripts/Skills/skill448.cs index d1e9e07767..42098a8957 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill448.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill448.cs @@ -104,7 +104,7 @@ namespace BrewMonster cls = 1; name = "真·炙炎阵"; nativename = "真·炙炎阵"; - icon = "炙炎阵1.dds"; + icon = "炙炎阵1"; max_level = 1; type = 1; apcost = 100; @@ -125,7 +125,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "1炙炎阵.sgc"; + effect = "1炙炎阵"; doenchant = 1; dobless = 0; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill449.cs b/Assets/PerfectWorld/Scripts/Skills/skill449.cs index 2b324aa871..55a0b39f7b 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill449.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill449.cs @@ -104,7 +104,7 @@ namespace BrewMonster cls = 1; name = "狂·炙炎阵"; nativename = "狂·炙炎阵"; - icon = "炙炎阵2.dds"; + icon = "炙炎阵2"; max_level = 1; type = 1; apcost = 100; @@ -125,7 +125,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "2炙炎阵.sgc"; + effect = "2炙炎阵"; doenchant = 0; dobless = 1; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill450.cs b/Assets/PerfectWorld/Scripts/Skills/skill450.cs index 4b6e589c11..9c16bd4318 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill450.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill450.cs @@ -87,7 +87,7 @@ namespace BrewMonster cls = 1; name = "真·烈火炽翼"; nativename = "真·烈火炽翼"; - icon = "烈火炽翼1.dds"; + icon = "烈火炽翼1"; max_level = 1; type = 1; apcost = 0; @@ -108,7 +108,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "1炎索.sgc"; + effect = "1炎索"; doenchant = 1; dobless = 0; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill451.cs b/Assets/PerfectWorld/Scripts/Skills/skill451.cs index c0fd134015..385ff730f6 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill451.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill451.cs @@ -87,7 +87,7 @@ namespace BrewMonster cls = 1; name = "狂·烈火炽翼"; nativename = "狂·烈火炽翼"; - icon = "烈火炽翼2.dds"; + icon = "烈火炽翼2"; max_level = 1; type = 1; apcost = 0; @@ -108,7 +108,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "2炎索.sgc"; + effect = "2炎索"; doenchant = 1; dobless = 0; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill452.cs b/Assets/PerfectWorld/Scripts/Skills/skill452.cs index 4f89ad0993..6e83e21cb0 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill452.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill452.cs @@ -88,7 +88,7 @@ namespace BrewMonster cls = 1; name = "真·血祭炎爆"; nativename = "真·血祭炎爆"; - icon = "血祭炎爆1.dds"; + icon = "血祭炎爆1"; max_level = 1; type = 1; apcost = 0; @@ -109,7 +109,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "1血祭炎爆.sgc"; + effect = "1血祭炎爆"; doenchant = 0; dobless = 0; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill453.cs b/Assets/PerfectWorld/Scripts/Skills/skill453.cs index c1e3c9c9f7..83077f383f 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill453.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill453.cs @@ -88,7 +88,7 @@ namespace BrewMonster cls = 1; name = "狂·血祭炎爆"; nativename = "狂·血祭炎爆"; - icon = "血祭炎爆2.dds"; + icon = "血祭炎爆2"; max_level = 1; type = 1; apcost = 0; @@ -109,7 +109,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "2血祭炎爆.sgc"; + effect = "2血祭炎爆"; doenchant = 1; dobless = 0; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill454.cs b/Assets/PerfectWorld/Scripts/Skills/skill454.cs index 65789bd297..6f489df5f9 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill454.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill454.cs @@ -90,7 +90,7 @@ namespace BrewMonster cls = 1; name = "真·火海刀山"; nativename = "真·火海刀山"; - icon = "火海刀山1.dds"; + icon = "火海刀山1"; max_level = 1; type = 1; apcost = 200; @@ -111,7 +111,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "1火海刀山.sgc"; + effect = "1火海刀山"; doenchant = 0; dobless = 1; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill455.cs b/Assets/PerfectWorld/Scripts/Skills/skill455.cs index 70148f9edd..f94b861723 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill455.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill455.cs @@ -90,7 +90,7 @@ namespace BrewMonster cls = 1; name = "狂·火海刀山"; nativename = "狂·火海刀山"; - icon = "火海刀山2.dds"; + icon = "火海刀山2"; max_level = 1; type = 1; apcost = 200; @@ -111,7 +111,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "2火海刀山.sgc"; + effect = "2火海刀山"; doenchant = 1; dobless = 0; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill456.cs b/Assets/PerfectWorld/Scripts/Skills/skill456.cs index ecb5f226b0..8fa078a9b2 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill456.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill456.cs @@ -87,7 +87,7 @@ namespace BrewMonster cls = 1; name = "真·涌泉"; nativename = "真·涌泉"; - icon = "涌泉1.dds"; + icon = "涌泉1"; max_level = 1; type = 1; apcost = 0; @@ -108,7 +108,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "1涌泉.sgc"; + effect = "1涌泉"; doenchant = 1; dobless = 0; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill457.cs b/Assets/PerfectWorld/Scripts/Skills/skill457.cs index 466ca28d0d..ef5752ad9c 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill457.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill457.cs @@ -87,7 +87,7 @@ namespace BrewMonster cls = 1; name = "狂·涌泉"; nativename = "狂·涌泉"; - icon = "涌泉2.dds"; + icon = "涌泉2"; max_level = 1; type = 1; apcost = 0; @@ -108,7 +108,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "2涌泉.sgc"; + effect = "2涌泉"; doenchant = 1; dobless = 0; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill458.cs b/Assets/PerfectWorld/Scripts/Skills/skill458.cs index 8bcc99d23b..84cbbf2db2 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill458.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill458.cs @@ -84,7 +84,7 @@ namespace BrewMonster cls = 1; name = "真·寒冰护甲"; nativename = "真·寒冰护甲"; - icon = "寒冰护甲1.dds"; + icon = "寒冰护甲1"; max_level = 1; type = 2; apcost = 30; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill459.cs b/Assets/PerfectWorld/Scripts/Skills/skill459.cs index e0fbf395e3..602b9f05ba 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill459.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill459.cs @@ -84,7 +84,7 @@ namespace BrewMonster cls = 1; name = "狂·寒冰护甲"; nativename = "狂·寒冰护甲"; - icon = "寒冰护甲2.dds"; + icon = "寒冰护甲2"; max_level = 1; type = 2; apcost = 30; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill460.cs b/Assets/PerfectWorld/Scripts/Skills/skill460.cs index d666778f24..8cd24dc13c 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill460.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill460.cs @@ -87,7 +87,7 @@ namespace BrewMonster cls = 1; name = "真·冰雹"; nativename = "真·冰雹"; - icon = "冰雹1.dds"; + icon = "冰雹1"; max_level = 1; type = 1; apcost = 0; @@ -109,7 +109,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 3; - effect = "1冰雹.sgc"; + effect = "1冰雹"; doenchant = 1; dobless = 0; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill461.cs b/Assets/PerfectWorld/Scripts/Skills/skill461.cs index cb077f3592..9d89bc9339 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill461.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill461.cs @@ -87,7 +87,7 @@ namespace BrewMonster cls = 1; name = "狂·冰雹"; nativename = "狂·冰雹"; - icon = "冰雹2.dds"; + icon = "冰雹2"; max_level = 1; type = 1; apcost = 0; @@ -109,7 +109,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 3; - effect = "2冰雹.sgc"; + effect = "2冰雹"; doenchant = 1; dobless = 0; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill462.cs b/Assets/PerfectWorld/Scripts/Skills/skill462.cs index aa477b6d69..bc966a3020 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill462.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill462.cs @@ -84,7 +84,7 @@ namespace BrewMonster cls = 1; name = "真·寒露"; nativename = "真·寒露"; - icon = "寒露1.DDS"; + icon = "寒露1"; max_level = 1; type = 2; apcost = 0; @@ -105,7 +105,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "1寒露.sgc"; + effect = "1寒露"; doenchant = 1; dobless = 0; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill463.cs b/Assets/PerfectWorld/Scripts/Skills/skill463.cs index 76324db4c6..009df88739 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill463.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill463.cs @@ -84,7 +84,7 @@ namespace BrewMonster cls = 1; name = "狂·寒露"; nativename = "狂·寒露"; - icon = "寒露2.DDS"; + icon = "寒露2"; max_level = 1; type = 2; apcost = 0; @@ -105,7 +105,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "2寒露.sgc"; + effect = "2寒露"; doenchant = 1; dobless = 0; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill464.cs b/Assets/PerfectWorld/Scripts/Skills/skill464.cs index 5e9b3149dd..9bb9baf442 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill464.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill464.cs @@ -50,7 +50,7 @@ namespace BrewMonster cls = 1; name = "真·润泽"; nativename = "真·润泽"; - icon = "润泽1.dds"; + icon = "润泽1"; max_level = 1; type = 2; apcost = 100; @@ -71,7 +71,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "1润泽.sgc"; + effect = "1润泽"; doenchant = 1; dobless = 0; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill465.cs b/Assets/PerfectWorld/Scripts/Skills/skill465.cs index 2733f55e14..2b8bc6027f 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill465.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill465.cs @@ -50,7 +50,7 @@ namespace BrewMonster cls = 1; name = "狂·润泽"; nativename = "狂·润泽"; - icon = "润泽2.dds"; + icon = "润泽2"; max_level = 1; type = 2; apcost = 100; @@ -71,7 +71,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "2润泽.sgc"; + effect = "2润泽"; doenchant = 1; dobless = 0; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill466.cs b/Assets/PerfectWorld/Scripts/Skills/skill466.cs index 6c1e860e67..dc4ddcf188 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill466.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill466.cs @@ -84,7 +84,7 @@ namespace BrewMonster cls = 1; name = "真·霜刃"; nativename = "真·霜刃"; - icon = "霜刃1.dds"; + icon = "霜刃1"; max_level = 1; type = 2; apcost = 0; @@ -105,7 +105,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "1霜刃.sgc"; + effect = "1霜刃"; doenchant = 1; dobless = 0; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill467.cs b/Assets/PerfectWorld/Scripts/Skills/skill467.cs index c768d423b5..8a9ff828fb 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill467.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill467.cs @@ -84,7 +84,7 @@ namespace BrewMonster cls = 1; name = "狂·霜刃"; nativename = "狂·霜刃"; - icon = "霜刃2.dds"; + icon = "霜刃2"; max_level = 1; type = 2; apcost = 0; @@ -105,7 +105,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "2霜刃.sgc"; + effect = "2霜刃"; doenchant = 1; dobless = 0; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill468.cs b/Assets/PerfectWorld/Scripts/Skills/skill468.cs index 348c48f9c0..881c5f3212 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill468.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill468.cs @@ -87,7 +87,7 @@ namespace BrewMonster cls = 1; name = "真·凌杀"; nativename = "真·凌杀"; - icon = "凌杀1.dds"; + icon = "凌杀1"; max_level = 1; type = 1; apcost = 0; @@ -108,7 +108,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "1凌杀.sgc"; + effect = "1凌杀"; doenchant = 1; dobless = 0; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill469.cs b/Assets/PerfectWorld/Scripts/Skills/skill469.cs index eec1d00f57..afa97536ee 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill469.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill469.cs @@ -87,7 +87,7 @@ namespace BrewMonster cls = 1; name = "狂·凌杀"; nativename = "狂·凌杀"; - icon = "凌杀2.dds"; + icon = "凌杀2"; max_level = 1; type = 1; apcost = 0; @@ -108,7 +108,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "2凌杀.sgc"; + effect = "2凌杀"; doenchant = 1; dobless = 0; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill470.cs b/Assets/PerfectWorld/Scripts/Skills/skill470.cs index 81e15bbce8..868ff6a18c 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill470.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill470.cs @@ -87,7 +87,7 @@ namespace BrewMonster cls = 1; name = "真·玄冰水龙"; nativename = "真·玄冰水龙"; - icon = "玄冰水龙1.dds"; + icon = "玄冰水龙1"; max_level = 1; type = 1; apcost = 200; @@ -108,7 +108,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "1玄冰水龙.sgc"; + effect = "1玄冰水龙"; doenchant = 1; dobless = 1; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill471.cs b/Assets/PerfectWorld/Scripts/Skills/skill471.cs index 91fa93a5e5..17da8efb10 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill471.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill471.cs @@ -87,7 +87,7 @@ namespace BrewMonster cls = 1; name = "狂·玄冰水龙"; nativename = "狂·玄冰水龙"; - icon = "玄冰水龙2.dds"; + icon = "玄冰水龙2"; max_level = 1; type = 1; apcost = 200; @@ -108,7 +108,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "1玄冰水龙.sgc"; + effect = "1玄冰水龙"; doenchant = 1; dobless = 1; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill472.cs b/Assets/PerfectWorld/Scripts/Skills/skill472.cs index 62a746ba90..c76578a475 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill472.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill472.cs @@ -87,7 +87,7 @@ namespace BrewMonster cls = 1; name = "真·落石术"; nativename = "真·落石术"; - icon = "落石术1.dds"; + icon = "落石术1"; max_level = 1; type = 1; apcost = 0; @@ -108,7 +108,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "1落石术.sgc"; + effect = "1落石术"; doenchant = 0; dobless = 0; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill473.cs b/Assets/PerfectWorld/Scripts/Skills/skill473.cs index 1364177daa..7683c899b1 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill473.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill473.cs @@ -87,7 +87,7 @@ namespace BrewMonster cls = 1; name = "狂·落石术"; nativename = "狂·落石术"; - icon = "落石术2.dds"; + icon = "落石术2"; max_level = 1; type = 1; apcost = 0; @@ -108,7 +108,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "2落石术.sgc"; + effect = "2落石术"; doenchant = 1; dobless = 0; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill474.cs b/Assets/PerfectWorld/Scripts/Skills/skill474.cs index 14c4b0fb46..fad6ba7738 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill474.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill474.cs @@ -84,7 +84,7 @@ namespace BrewMonster cls = 1; name = "真·磐石护甲"; nativename = "真·磐石护甲"; - icon = "奇门护甲1.dds"; + icon = "奇门护甲1"; max_level = 1; type = 2; apcost = 30; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill475.cs b/Assets/PerfectWorld/Scripts/Skills/skill475.cs index a64a1d29fe..ef6683012b 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill475.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill475.cs @@ -84,7 +84,7 @@ namespace BrewMonster cls = 1; name = "狂·磐石护甲"; nativename = "狂·磐石护甲"; - icon = "奇门护甲2.dds"; + icon = "奇门护甲2"; max_level = 1; type = 2; apcost = 30; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill476.cs b/Assets/PerfectWorld/Scripts/Skills/skill476.cs index 62ef9ea53b..b344da13cd 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill476.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill476.cs @@ -87,7 +87,7 @@ namespace BrewMonster cls = 1; name = "真·沙陷"; nativename = "真·沙陷"; - icon = "沙陷1.dds"; + icon = "沙陷1"; max_level = 1; type = 1; apcost = 0; @@ -108,7 +108,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "1沙陷.sgc"; + effect = "1沙陷"; doenchant = 1; dobless = 0; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill477.cs b/Assets/PerfectWorld/Scripts/Skills/skill477.cs index 7634a3257b..139944863d 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill477.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill477.cs @@ -87,7 +87,7 @@ namespace BrewMonster cls = 1; name = "狂·沙陷"; nativename = "狂·沙陷"; - icon = "沙陷2.dds"; + icon = "沙陷2"; max_level = 1; type = 1; apcost = 0; @@ -108,7 +108,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "2沙陷.sgc"; + effect = "2沙陷"; doenchant = 1; dobless = 0; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill478.cs b/Assets/PerfectWorld/Scripts/Skills/skill478.cs index 0ac0a64f5c..e8ccf79149 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill478.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill478.cs @@ -83,7 +83,7 @@ namespace BrewMonster cls = 1; name = "真·缩地术"; nativename = "真·缩地术"; - icon = "缩地术1.dds"; + icon = "缩地术1"; max_level = 1; type = 8; apcost = 10; @@ -105,7 +105,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "1缩地术.sgc"; + effect = "1缩地术"; doenchant = 0; dobless = 0; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill479.cs b/Assets/PerfectWorld/Scripts/Skills/skill479.cs index e8f8a0a57e..a56fe21b60 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill479.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill479.cs @@ -83,7 +83,7 @@ namespace BrewMonster cls = 1; name = "狂·缩地术"; nativename = "狂·缩地术"; - icon = "缩地术2.dds"; + icon = "缩地术2"; max_level = 1; type = 8; apcost = 20; @@ -105,7 +105,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "缩地术.sgc"; + effect = "缩地术"; doenchant = 0; dobless = 0; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill480.cs b/Assets/PerfectWorld/Scripts/Skills/skill480.cs index c1d4133340..f499ff0739 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill480.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill480.cs @@ -87,7 +87,7 @@ namespace BrewMonster cls = 1; name = "真·飞沙术"; nativename = "真·飞沙术"; - icon = "飞沙术1.dds"; + icon = "飞沙术1"; max_level = 1; type = 1; apcost = 0; @@ -108,7 +108,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "1飞沙术.sgc"; + effect = "1飞沙术"; doenchant = 1; dobless = 0; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill481.cs b/Assets/PerfectWorld/Scripts/Skills/skill481.cs index 74a8af8dc3..975120315a 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill481.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill481.cs @@ -87,7 +87,7 @@ namespace BrewMonster cls = 1; name = "狂·飞沙术"; nativename = "狂·飞沙术"; - icon = "飞沙术2.dds"; + icon = "飞沙术2"; max_level = 1; type = 1; apcost = 0; @@ -108,7 +108,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "2飞沙术.sgc"; + effect = "2飞沙术"; doenchant = 1; dobless = 0; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill482.cs b/Assets/PerfectWorld/Scripts/Skills/skill482.cs index a3f9a2d08e..a75616a30c 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill482.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill482.cs @@ -84,7 +84,7 @@ namespace BrewMonster cls = 1; name = "真·石破天惊"; nativename = "真·石破天惊"; - icon = "石破天惊1.dds"; + icon = "石破天惊1"; max_level = 1; type = 3; apcost = 0; @@ -105,7 +105,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "1石破天惊.sgc"; + effect = "1石破天惊"; doenchant = 1; dobless = 0; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill483.cs b/Assets/PerfectWorld/Scripts/Skills/skill483.cs index aa1981dfa0..0fd846fc7c 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill483.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill483.cs @@ -84,7 +84,7 @@ namespace BrewMonster cls = 1; name = "狂·石破天惊"; nativename = "狂·石破天惊"; - icon = "石破天惊2.dds"; + icon = "石破天惊2"; max_level = 1; type = 3; apcost = 0; @@ -105,7 +105,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "2石破天惊.sgc"; + effect = "2石破天惊"; doenchant = 1; dobless = 0; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill484.cs b/Assets/PerfectWorld/Scripts/Skills/skill484.cs index be32f5f12a..75a3b2b92a 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill484.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill484.cs @@ -87,7 +87,7 @@ namespace BrewMonster cls = 1; name = "真·泰山压顶"; nativename = "真·泰山压顶"; - icon = "泰山压顶1.dds"; + icon = "泰山压顶1"; max_level = 1; type = 1; apcost = 200; @@ -108,7 +108,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "1泰山压顶.sgc"; + effect = "1泰山压顶"; doenchant = 1; dobless = 1; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill485.cs b/Assets/PerfectWorld/Scripts/Skills/skill485.cs index d148a42cb5..f2e2792100 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill485.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill485.cs @@ -87,7 +87,7 @@ namespace BrewMonster cls = 1; name = "狂·泰山压顶"; nativename = "狂·泰山压顶"; - icon = "泰山压顶2.dds"; + icon = "泰山压顶2"; max_level = 1; type = 1; apcost = 200; @@ -108,7 +108,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "2泰山压顶.sgc"; + effect = "2泰山压顶"; doenchant = 1; dobless = 0; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill486.cs b/Assets/PerfectWorld/Scripts/Skills/skill486.cs index 1c794b1726..c69e18645b 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill486.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill486.cs @@ -32,7 +32,7 @@ namespace BrewMonster cls = 1; name = "真·火精通"; nativename = "真·火精通"; - icon = "火精通1.DDS"; + icon = "火精通1"; max_level = 1; type = 5; apcost = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill487.cs b/Assets/PerfectWorld/Scripts/Skills/skill487.cs index ddf1e1e5ad..26a2b79f78 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill487.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill487.cs @@ -32,7 +32,7 @@ namespace BrewMonster cls = 1; name = "狂·火精通"; nativename = "狂·火精通"; - icon = "火精通2.DDS"; + icon = "火精通2"; max_level = 1; type = 5; apcost = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill488.cs b/Assets/PerfectWorld/Scripts/Skills/skill488.cs index 3c951ba512..498a58b22f 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill488.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill488.cs @@ -32,7 +32,7 @@ namespace BrewMonster cls = 1; name = "真·水精通"; nativename = "真·水精通"; - icon = "水精通1.dds"; + icon = "水精通1"; max_level = 1; type = 5; apcost = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill489.cs b/Assets/PerfectWorld/Scripts/Skills/skill489.cs index 9a712f3171..e01c3b716a 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill489.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill489.cs @@ -32,7 +32,7 @@ namespace BrewMonster cls = 1; name = "狂·水精通"; nativename = "狂·水精通"; - icon = "水精通2.dds"; + icon = "水精通2"; max_level = 1; type = 5; apcost = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill490.cs b/Assets/PerfectWorld/Scripts/Skills/skill490.cs index 0c201ae473..818f2c0dda 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill490.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill490.cs @@ -32,7 +32,7 @@ namespace BrewMonster cls = 1; name = "真·土精通"; nativename = "真·土精通"; - icon = "土精通1.dds"; + icon = "土精通1"; max_level = 1; type = 5; apcost = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill491.cs b/Assets/PerfectWorld/Scripts/Skills/skill491.cs index 42a28ced0e..6f06143fc5 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill491.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill491.cs @@ -32,7 +32,7 @@ namespace BrewMonster cls = 1; name = "狂·土精通"; nativename = "狂·土精通"; - icon = "土精通2.dds"; + icon = "土精通2"; max_level = 1; type = 5; apcost = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill5.cs b/Assets/PerfectWorld/Scripts/Skills/skill5.cs index bc6ced6403..222989bea7 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill5.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill5.cs @@ -86,7 +86,7 @@ namespace BrewMonster cls = 0; name = "龙现"; nativename = "龙现"; - icon = "龙现.dds"; + icon = "龙现"; max_level = 10; type = 1; apcost = 0; @@ -107,7 +107,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "龙现.sgc"; + effect = "龙现"; doenchant = 0; dobless = 0; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill53.cs b/Assets/PerfectWorld/Scripts/Skills/skill53.cs index 1f0702aa70..b4a392a85f 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill53.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill53.cs @@ -31,7 +31,7 @@ namespace BrewMonster cls = 1; name = "火精通"; nativename = "火精通"; - icon = "火精通.dds"; + icon = "火精通"; max_level = 10; type = 5; apcost = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill54.cs b/Assets/PerfectWorld/Scripts/Skills/skill54.cs index 2b6ebbb065..4e13e78e03 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill54.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill54.cs @@ -87,7 +87,7 @@ namespace BrewMonster cls = 0; name = "流水"; nativename = "流水"; - icon = "流水.dds"; + icon = "流水"; max_level = 10; type = 1; apcost = 30; @@ -108,7 +108,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "流水.sgc"; + effect = "流水"; doenchant = 0; dobless = 0; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill55.cs b/Assets/PerfectWorld/Scripts/Skills/skill55.cs index e8cf526dff..5b3f78f75b 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill55.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill55.cs @@ -86,7 +86,7 @@ namespace BrewMonster cls = 0; name = "狂龙斩"; nativename = "狂龙斩"; - icon = "狂龙斩.dds"; + icon = "狂龙斩"; max_level = 10; type = 1; apcost = 0; @@ -107,7 +107,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "狂龙斩.sgc"; + effect = "狂龙斩"; doenchant = 0; dobless = 0; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill56.cs b/Assets/PerfectWorld/Scripts/Skills/skill56.cs index f230566b6e..ef69eff984 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill56.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill56.cs @@ -86,7 +86,7 @@ namespace BrewMonster cls = 0; name = "横扫千军"; nativename = "横扫千军"; - icon = "横扫千军.dds"; + icon = "横扫千军"; max_level = 10; type = 1; apcost = 0; @@ -107,7 +107,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "横扫千军.sgc"; + effect = "横扫千军"; doenchant = 0; dobless = 0; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill57.cs b/Assets/PerfectWorld/Scripts/Skills/skill57.cs index e626a1befc..c64f02b690 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill57.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill57.cs @@ -86,7 +86,7 @@ namespace BrewMonster cls = 0; name = "断岩斩"; nativename = "断岩斩"; - icon = "断岩斩.dds"; + icon = "断岩斩"; max_level = 10; type = 1; apcost = 0; @@ -107,7 +107,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "断岩斩.sgc"; + effect = "断岩斩"; doenchant = 1; dobless = 0; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill58.cs b/Assets/PerfectWorld/Scripts/Skills/skill58.cs index 18ab441fcf..33c817ce13 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill58.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill58.cs @@ -81,7 +81,7 @@ namespace BrewMonster cls = 0; name = "龙腾"; nativename = "龙腾"; - icon = "龙腾.dds"; + icon = "龙腾"; max_level = 10; type = 8; apcost = 10; @@ -102,7 +102,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "龙腾.sgc"; + effect = "龙腾"; doenchant = 1; dobless = 0; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill59.cs b/Assets/PerfectWorld/Scripts/Skills/skill59.cs index 4fc01ea830..d1a15d324c 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill59.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill59.cs @@ -81,7 +81,7 @@ namespace BrewMonster cls = 0; name = "虎跃"; nativename = "虎跃"; - icon = "虎跃.dds"; + icon = "虎跃"; max_level = 10; type = 8; apcost = 10; @@ -102,7 +102,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "虎跃.sgc"; + effect = "虎跃"; doenchant = 1; dobless = 0; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill6.cs b/Assets/PerfectWorld/Scripts/Skills/skill6.cs index b324b78039..49fe9c7f05 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill6.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill6.cs @@ -31,7 +31,7 @@ namespace BrewMonster cls = 0; name = "刀剑精通"; nativename = "刀剑精通"; - icon = "刀剑精通.dds"; + icon = "刀剑精通"; max_level = 10; type = 5; apcost = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill60.cs b/Assets/PerfectWorld/Scripts/Skills/skill60.cs index ce2f72eeed..c82ce84e9b 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill60.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill60.cs @@ -86,7 +86,7 @@ namespace BrewMonster cls = 0; name = "劈空掌"; nativename = "劈空掌"; - icon = "劈空掌.dds"; + icon = "劈空掌"; max_level = 10; type = 1; apcost = 100; @@ -107,7 +107,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "劈空掌.sgc"; + effect = "劈空掌"; doenchant = 1; dobless = 0; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill61.cs b/Assets/PerfectWorld/Scripts/Skills/skill61.cs index 797f6fd683..3c907d4bf6 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill61.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill61.cs @@ -86,7 +86,7 @@ namespace BrewMonster cls = 0; name = "无影脚"; nativename = "无影脚"; - icon = "无影脚.dds"; + icon = "无影脚"; max_level = 10; type = 1; apcost = 0; @@ -107,7 +107,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "无影脚.sgc"; + effect = "无影脚"; doenchant = 1; dobless = 0; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill62.cs b/Assets/PerfectWorld/Scripts/Skills/skill62.cs index 0ac870a19d..4b544001b3 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill62.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill62.cs @@ -86,7 +86,7 @@ namespace BrewMonster cls = 0; name = "风卷残云"; nativename = "风卷残云"; - icon = "风卷残云.dds"; + icon = "风卷残云"; max_level = 10; type = 1; apcost = 0; @@ -107,7 +107,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "风卷残云.sgc"; + effect = "风卷残云"; doenchant = 0; dobless = 1; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill63.cs b/Assets/PerfectWorld/Scripts/Skills/skill63.cs index b1a8e6c0a7..af51cf337b 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill63.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill63.cs @@ -86,7 +86,7 @@ namespace BrewMonster cls = 0; name = "云龙九现"; nativename = "云龙九现"; - icon = "云龙九现.dds"; + icon = "云龙九现"; max_level = 10; type = 1; apcost = 200; @@ -107,7 +107,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "云龙九现.sgc"; + effect = "云龙九现"; doenchant = 0; dobless = 1; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill64.cs b/Assets/PerfectWorld/Scripts/Skills/skill64.cs index eac915f1e1..d2d6854327 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill64.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill64.cs @@ -86,7 +86,7 @@ namespace BrewMonster cls = 0; name = "疾风刺"; nativename = "疾风刺"; - icon = "疾风霹雳.dds"; + icon = "疾风霹雳"; max_level = 10; type = 1; apcost = 100; @@ -107,7 +107,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "疾风霹雳.sgc"; + effect = "疾风霹雳"; doenchant = 1; dobless = 0; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill65.cs b/Assets/PerfectWorld/Scripts/Skills/skill65.cs index 609263830e..96305c7241 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill65.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill65.cs @@ -86,7 +86,7 @@ namespace BrewMonster cls = 0; name = "回马枪"; nativename = "回马枪"; - icon = "回马枪.dds"; + icon = "回马枪"; max_level = 10; type = 1; apcost = 0; @@ -107,7 +107,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "回马枪.sgc"; + effect = "回马枪"; doenchant = 0; dobless = 0; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill66.cs b/Assets/PerfectWorld/Scripts/Skills/skill66.cs index 49a6a4747f..95a9d980c9 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill66.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill66.cs @@ -86,7 +86,7 @@ namespace BrewMonster cls = 0; name = "流星赶月"; nativename = "流星赶月"; - icon = "流星赶月.dds"; + icon = "流星赶月"; max_level = 10; type = 1; apcost = 0; @@ -107,7 +107,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "流星赶月.sgc"; + effect = "流星赶月"; doenchant = 1; dobless = 0; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill67.cs b/Assets/PerfectWorld/Scripts/Skills/skill67.cs index c698316e41..9c627b0de2 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill67.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill67.cs @@ -86,7 +86,7 @@ namespace BrewMonster cls = 0; name = "寒冰刃域"; nativename = "寒冰刃域"; - icon = "刃域.dds"; + icon = "刃域"; max_level = 10; type = 1; apcost = 200; @@ -107,7 +107,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "刃域.sgc"; + effect = "刃域"; doenchant = 1; dobless = 0; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill68.cs b/Assets/PerfectWorld/Scripts/Skills/skill68.cs index 76111fd021..639295f0ad 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill68.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill68.cs @@ -87,7 +87,7 @@ namespace BrewMonster cls = 0; name = "龙飞击"; nativename = "龙飞击"; - icon = "霸王龙飞.dds"; + icon = "霸王龙飞"; max_level = 10; type = 1; apcost = 100; @@ -108,7 +108,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "霸王龙飞.sgc"; + effect = "霸王龙飞"; doenchant = 1; dobless = 0; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill69.cs b/Assets/PerfectWorld/Scripts/Skills/skill69.cs index 44fde88c0a..b54fb0d216 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill69.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill69.cs @@ -86,7 +86,7 @@ namespace BrewMonster cls = 0; name = "天火狂龙"; nativename = "天火狂龙"; - icon = "天火狂龙.dds"; + icon = "天火狂龙"; max_level = 10; type = 1; apcost = 200; @@ -107,7 +107,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "霸王献鼎.sgc"; + effect = "霸王献鼎"; doenchant = 1; dobless = 0; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill7.cs b/Assets/PerfectWorld/Scripts/Skills/skill7.cs index 7778aeb749..789e39e9fc 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill7.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill7.cs @@ -86,7 +86,7 @@ namespace BrewMonster cls = 1; name = "火煞天灯"; nativename = "火煞天灯"; - icon = "火煞天灯.dds"; + icon = "火煞天灯"; max_level = 10; type = 1; apcost = 0; @@ -107,7 +107,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "火煞天灯.sgc"; + effect = "火煞天灯"; doenchant = 1; dobless = 0; commoncooldown = 0; @@ -166,4 +166,3 @@ namespace BrewMonster } } - diff --git a/Assets/PerfectWorld/Scripts/Skills/skill70.cs b/Assets/PerfectWorld/Scripts/Skills/skill70.cs index db1753443a..4a394a9bfe 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill70.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill70.cs @@ -86,7 +86,7 @@ namespace BrewMonster cls = 0; name = "断岳扫"; nativename = "断岳扫"; - icon = "霸王断岳.dds"; + icon = "霸王断岳"; max_level = 10; type = 1; apcost = 0; @@ -107,7 +107,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "霸王断岳.sgc"; + effect = "霸王断岳"; doenchant = 0; dobless = 0; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill71.cs b/Assets/PerfectWorld/Scripts/Skills/skill71.cs index de7344883b..1abd3e6cf8 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill71.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill71.cs @@ -86,7 +86,7 @@ namespace BrewMonster cls = 0; name = "裂岩炎震"; nativename = "裂岩炎震"; - icon = "霸王暴怒.dds"; + icon = "霸王暴怒"; max_level = 10; type = 1; apcost = 0; @@ -107,7 +107,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "霸王暴怒.sgc"; + effect = "霸王暴怒"; doenchant = 1; dobless = 0; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill72.cs b/Assets/PerfectWorld/Scripts/Skills/skill72.cs index 2403c04e9f..32117e8871 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill72.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill72.cs @@ -86,7 +86,7 @@ namespace BrewMonster cls = 0; name = "忘情式"; nativename = "忘情式"; - icon = "忘情式.dds"; + icon = "忘情式"; max_level = 10; type = 1; apcost = 100; @@ -107,7 +107,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "忘情式.sgc"; + effect = "忘情式"; doenchant = 1; dobless = 0; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill73.cs b/Assets/PerfectWorld/Scripts/Skills/skill73.cs index a28f8af1bf..e3ef67c5b4 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill73.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill73.cs @@ -86,7 +86,7 @@ namespace BrewMonster cls = 0; name = "追魂诀"; nativename = "追魂诀"; - icon = "追魂诀.dds"; + icon = "追魂诀"; max_level = 10; type = 1; apcost = 0; @@ -107,7 +107,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "追魂诀.sgc"; + effect = "追魂诀"; doenchant = 0; dobless = 0; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill74.cs b/Assets/PerfectWorld/Scripts/Skills/skill74.cs index 46da916cd3..128d9c4c0d 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill74.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill74.cs @@ -86,7 +86,7 @@ namespace BrewMonster cls = 0; name = "剑气纵横"; nativename = "剑气纵横"; - icon = "剑气纵横.dds"; + icon = "剑气纵横"; max_level = 10; type = 1; apcost = 0; @@ -107,7 +107,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "剑气纵横.sgc"; + effect = "剑气纵横"; doenchant = 1; dobless = 0; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill75.cs b/Assets/PerfectWorld/Scripts/Skills/skill75.cs index 549ddce60a..cf8b13d771 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill75.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill75.cs @@ -86,7 +86,7 @@ namespace BrewMonster cls = 0; name = "万剑诀"; nativename = "万剑诀"; - icon = "万剑诀.dds"; + icon = "万剑诀"; max_level = 10; type = 1; apcost = 200; @@ -107,7 +107,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "万剑诀.sgc"; + effect = "万剑诀"; doenchant = 1; dobless = 0; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill76.cs b/Assets/PerfectWorld/Scripts/Skills/skill76.cs index 78da0519c6..65f9421930 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill76.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill76.cs @@ -49,7 +49,7 @@ namespace BrewMonster cls = 0; name = "疾云步"; nativename = "疾云步"; - icon = "疾云步.dds"; + icon = "疾云步"; max_level = 10; type = 2; apcost = 0; @@ -70,7 +70,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "疾云步.sgc"; + effect = "疾云步"; doenchant = 1; dobless = 0; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill77.cs b/Assets/PerfectWorld/Scripts/Skills/skill77.cs index db15bf608d..3e5133ebf8 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill77.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill77.cs @@ -83,7 +83,7 @@ namespace BrewMonster cls = 0; name = "金钟罩"; nativename = "金钟罩"; - icon = "金钟罩.dds"; + icon = "金钟罩"; max_level = 10; type = 2; apcost = 0; @@ -104,7 +104,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "金钟罩.sgc"; + effect = "金钟罩"; doenchant = 1; dobless = 0; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill78.cs b/Assets/PerfectWorld/Scripts/Skills/skill78.cs index bd76bb8ca0..14c889c502 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill78.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill78.cs @@ -31,7 +31,7 @@ namespace BrewMonster cls = 0; name = "长兵精通"; nativename = "长兵精通"; - icon = "长兵精通.dds"; + icon = "长兵精通"; max_level = 10; type = 5; apcost = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill79.cs b/Assets/PerfectWorld/Scripts/Skills/skill79.cs index e05beaf9f3..00951c2b71 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill79.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill79.cs @@ -31,7 +31,7 @@ namespace BrewMonster cls = 0; name = "斧锤精通"; nativename = "斧锤精通"; - icon = "斧锤精通.dds"; + icon = "斧锤精通"; max_level = 10; type = 5; apcost = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill8.cs b/Assets/PerfectWorld/Scripts/Skills/skill8.cs index 8ed493b4ca..bda0b23eb9 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill8.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill8.cs @@ -87,7 +87,7 @@ namespace BrewMonster cls = 1; name = "血祭炎爆"; nativename = "血祭炎爆"; - icon = "血祭炎爆.dds"; + icon = "血祭炎爆"; max_level = 10; type = 1; apcost = 0; @@ -108,7 +108,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "血祭炎爆.sgc"; + effect = "血祭炎爆"; doenchant = 0; dobless = 0; commoncooldown = 0; @@ -167,4 +167,3 @@ namespace BrewMonster } } - diff --git a/Assets/PerfectWorld/Scripts/Skills/skill80.cs b/Assets/PerfectWorld/Scripts/Skills/skill80.cs index 721c0bfb5f..401f960713 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill80.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill80.cs @@ -31,7 +31,7 @@ namespace BrewMonster cls = 0; name = "拳术精通"; nativename = "拳术精通"; - icon = "拳术精通.dds"; + icon = "拳术精通"; max_level = 10; type = 5; apcost = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill81.cs b/Assets/PerfectWorld/Scripts/Skills/skill81.cs index 5d666fe5df..07bc3e5249 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill81.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill81.cs @@ -86,7 +86,7 @@ namespace BrewMonster cls = 1; name = "烈火符"; nativename = "烈火符"; - icon = "烈火符.dds"; + icon = "烈火符"; max_level = 10; type = 1; apcost = 0; @@ -107,7 +107,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "烈火符.sgc"; + effect = "烈火符"; doenchant = 0; dobless = 0; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill84.cs b/Assets/PerfectWorld/Scripts/Skills/skill84.cs index 8a7602315d..c6072c717f 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill84.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill84.cs @@ -86,7 +86,7 @@ namespace BrewMonster cls = 1; name = "烈火炽翼"; nativename = "烈火炽翼"; - icon = "烈火炽翼.dds"; + icon = "烈火炽翼"; max_level = 10; type = 1; apcost = 0; @@ -107,7 +107,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "炎索.sgc"; + effect = "炎索"; doenchant = 1; dobless = 0; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill85.cs b/Assets/PerfectWorld/Scripts/Skills/skill85.cs index a6757f8b5c..53832af5e7 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill85.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill85.cs @@ -86,7 +86,7 @@ namespace BrewMonster cls = 1; name = "神火符"; nativename = "神火符"; - icon = "神火符.dds"; + icon = "神火符"; max_level = 10; type = 1; apcost = 0; @@ -107,7 +107,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "神火符.sgc"; + effect = "神火符"; doenchant = 0; dobless = 0; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill86.cs b/Assets/PerfectWorld/Scripts/Skills/skill86.cs index 8c818b5863..ec305f9fb5 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill86.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill86.cs @@ -103,7 +103,7 @@ namespace BrewMonster cls = 1; name = "炙炎阵"; nativename = "炙炎阵"; - icon = "炙炎阵.dds"; + icon = "炙炎阵"; max_level = 10; type = 1; apcost = 100; @@ -124,7 +124,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "炙炎阵.sgc"; + effect = "炙炎阵"; doenchant = 0; dobless = 0; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill87.cs b/Assets/PerfectWorld/Scripts/Skills/skill87.cs index e40b2d1e35..1f4fffc05a 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill87.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill87.cs @@ -89,7 +89,7 @@ namespace BrewMonster cls = 1; name = "火海刀山"; nativename = "火海刀山"; - icon = "火海刀山.dds"; + icon = "火海刀山"; max_level = 10; type = 1; apcost = 200; @@ -110,7 +110,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "火海刀山.sgc"; + effect = "火海刀山"; doenchant = 0; dobless = 0; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill88.cs b/Assets/PerfectWorld/Scripts/Skills/skill88.cs index ddd4cd2814..f0328516a2 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill88.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill88.cs @@ -86,7 +86,7 @@ namespace BrewMonster cls = 1; name = "涌泉"; nativename = "涌泉"; - icon = "涌泉.dds"; + icon = "涌泉"; max_level = 10; type = 1; apcost = 0; @@ -107,7 +107,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "涌泉.sgc"; + effect = "涌泉"; doenchant = 1; dobless = 0; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill89.cs b/Assets/PerfectWorld/Scripts/Skills/skill89.cs index f358353ecb..a025ef8f96 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill89.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill89.cs @@ -49,7 +49,7 @@ namespace BrewMonster cls = 1; name = "润泽"; nativename = "润泽"; - icon = "润泽.dds"; + icon = "润泽"; max_level = 10; type = 2; apcost = 100; @@ -70,7 +70,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "润泽.sgc"; + effect = "润泽"; doenchant = 1; dobless = 0; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill896.cs b/Assets/PerfectWorld/Scripts/Skills/skill896.cs index cd69542989..dde2c92b18 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill896.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill896.cs @@ -50,7 +50,7 @@ namespace BrewMonster cls = 0; name = "狂龙之力"; nativename = "狂龙之力"; - icon = "狂龙之力.dds"; + icon = "狂龙之力"; max_level = 1; type = 2; apcost = 100; @@ -70,7 +70,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "狂龙之力.sgc"; + effect = "狂龙之力"; doenchant = 1; dobless = 0; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill897.cs b/Assets/PerfectWorld/Scripts/Skills/skill897.cs index 4c2d1b9ae8..eea7574cc7 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill897.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill897.cs @@ -85,7 +85,7 @@ namespace BrewMonster cls = 0; name = "雷霆震击"; nativename = "雷霆震击"; - icon = "雷霆震击.dds"; + icon = "雷霆震击"; max_level = 1; type = 1; apcost = 100; @@ -105,7 +105,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "雷霆震击.sgc"; + effect = "雷霆震击"; doenchant = 1; dobless = 1; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill898.cs b/Assets/PerfectWorld/Scripts/Skills/skill898.cs index 03166af860..d03de9beb1 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill898.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill898.cs @@ -87,7 +87,7 @@ namespace BrewMonster cls = 0; name = "断空"; nativename = "断空"; - icon = "剑啸长空.dds"; + icon = "剑啸长空"; max_level = 1; type = 1; apcost = 15; @@ -108,7 +108,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "无影.sgc"; + effect = "无影"; doenchant = 1; dobless = 0; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill899.cs b/Assets/PerfectWorld/Scripts/Skills/skill899.cs index e8ec35c665..d1dc8478ea 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill899.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill899.cs @@ -86,7 +86,7 @@ namespace BrewMonster cls = 0; name = "一闪"; nativename = "一闪"; - icon = "一闪.dds"; + icon = "一闪"; max_level = 1; type = 1; apcost = 100; @@ -107,7 +107,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "一闪.sgc"; + effect = "一闪"; doenchant = 1; dobless = 0; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill9.cs b/Assets/PerfectWorld/Scripts/Skills/skill9.cs index bf45e4d398..ec23f5e09b 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill9.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill9.cs @@ -31,7 +31,7 @@ namespace BrewMonster cls = 1; name = "水精通"; nativename = "水精通"; - icon = "水精通.dds"; + icon = "水精通"; max_level = 10; type = 5; apcost = 0; @@ -98,4 +98,3 @@ namespace BrewMonster } } - diff --git a/Assets/PerfectWorld/Scripts/Skills/skill90.cs b/Assets/PerfectWorld/Scripts/Skills/skill90.cs index b072de8295..717dcce4b2 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill90.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill90.cs @@ -83,7 +83,7 @@ namespace BrewMonster cls = 1; name = "寒露"; nativename = "寒露"; - icon = "寒霜.dds"; + icon = "寒霜"; max_level = 10; type = 2; apcost = 0; @@ -104,7 +104,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "寒露.sgc"; + effect = "寒露"; doenchant = 1; dobless = 0; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill900.cs b/Assets/PerfectWorld/Scripts/Skills/skill900.cs index efe9edbefa..a9e60c4732 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill900.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill900.cs @@ -84,7 +84,7 @@ namespace BrewMonster cls = 0; name = "金刚气"; nativename = "金刚气"; - icon = "金刚气.dds"; + icon = "金刚气"; max_level = 1; type = 2; apcost = 0; @@ -104,7 +104,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "1风卷残云.sgc.sgc"; + effect = "1风卷残云.sgc"; doenchant = 1; dobless = 1; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill901.cs b/Assets/PerfectWorld/Scripts/Skills/skill901.cs index e1006b43ec..4df077d7ce 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill901.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill901.cs @@ -83,7 +83,7 @@ namespace BrewMonster cls = 1; name = "气贯长虹"; nativename = "气贯长虹"; - icon = "气贯长虹.dds"; + icon = "气贯长虹"; max_level = 1; type = 2; apcost = 100; @@ -103,7 +103,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "气惯长虹.sgc"; + effect = "气惯长虹"; doenchant = 1; dobless = 0; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill902.cs b/Assets/PerfectWorld/Scripts/Skills/skill902.cs index b28c880491..75b9bd9aad 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill902.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill902.cs @@ -87,7 +87,7 @@ namespace BrewMonster cls = 1; name = "土灵击"; nativename = "土灵击"; - icon = "土灵击.dds"; + icon = "土灵击"; max_level = 1; type = 1; apcost = 0; @@ -107,7 +107,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "地缚.sgc"; + effect = "地缚"; doenchant = 1; dobless = 0; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill903.cs b/Assets/PerfectWorld/Scripts/Skills/skill903.cs index 9875a9471b..4cdb4dd9c4 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill903.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill903.cs @@ -50,7 +50,7 @@ namespace BrewMonster cls = 1; name = "摄魂之力"; nativename = "摄魂之力"; - icon = "摄魂之力.dds"; + icon = "摄魂之力"; max_level = 1; type = 3; apcost = 20; @@ -70,7 +70,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "疲惫.sgc"; + effect = "疲惫"; doenchant = 1; dobless = 0; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill904.cs b/Assets/PerfectWorld/Scripts/Skills/skill904.cs index 6c0cbe5232..0f8612260a 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill904.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill904.cs @@ -50,7 +50,7 @@ namespace BrewMonster cls = 1; name = "真元护体"; nativename = "真元护体"; - icon = "真元护体.dds"; + icon = "真元护体"; max_level = 1; type = 2; apcost = 0; @@ -70,7 +70,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "五行之护.sgc"; + effect = "五行之护"; doenchant = 1; dobless = 1; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill905.cs b/Assets/PerfectWorld/Scripts/Skills/skill905.cs index 737fbfa282..41bbeddbbe 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill905.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill905.cs @@ -85,7 +85,7 @@ namespace BrewMonster cls = 1; name = "灵气震爆"; nativename = "灵气震爆"; - icon = "灵气震爆.dds"; + icon = "灵气震爆"; max_level = 1; type = 1; apcost = 100; @@ -106,7 +106,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "元素虚空.sgc"; + effect = "元素虚空"; doenchant = 1; dobless = 0; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill91.cs b/Assets/PerfectWorld/Scripts/Skills/skill91.cs index 755e0801ba..11360eec15 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill91.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill91.cs @@ -83,7 +83,7 @@ namespace BrewMonster cls = 1; name = "霜刃"; nativename = "霜刃"; - icon = "霜刃.dds"; + icon = "霜刃"; max_level = 10; type = 2; apcost = 0; @@ -104,7 +104,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "霜刃.sgc"; + effect = "霜刃"; doenchant = 1; dobless = 0; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill92.cs b/Assets/PerfectWorld/Scripts/Skills/skill92.cs index fdd1cdb682..2d9c35c623 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill92.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill92.cs @@ -86,7 +86,7 @@ namespace BrewMonster cls = 1; name = "凌杀"; nativename = "凌杀"; - icon = "凌杀.dds"; + icon = "凌杀"; max_level = 10; type = 1; apcost = 0; @@ -107,7 +107,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "凌杀.sgc"; + effect = "凌杀"; doenchant = 1; dobless = 0; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill923.cs b/Assets/PerfectWorld/Scripts/Skills/skill923.cs index 67f8f4533f..307f7922c5 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill923.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill923.cs @@ -86,7 +86,7 @@ namespace BrewMonster cls = 0; name = "一闪"; nativename = "一闪"; - icon = "一闪.dds"; + icon = "一闪"; max_level = 1; type = 1; apcost = 100; @@ -107,7 +107,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "一闪.sgc"; + effect = "一闪"; doenchant = 1; dobless = 0; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill924.cs b/Assets/PerfectWorld/Scripts/Skills/skill924.cs index 76e91422ee..d08e57f264 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill924.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill924.cs @@ -84,7 +84,7 @@ namespace BrewMonster cls = 0; name = "金刚气"; nativename = "金刚气"; - icon = "金刚气.dds"; + icon = "金刚气"; max_level = 1; type = 2; apcost = 0; @@ -104,7 +104,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "1风卷残云.sgc"; + effect = "1风卷残云"; doenchant = 1; dobless = 1; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill925.cs b/Assets/PerfectWorld/Scripts/Skills/skill925.cs index d520526d59..278e8c30a6 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill925.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill925.cs @@ -83,7 +83,7 @@ namespace BrewMonster cls = 1; name = "气贯长虹"; nativename = "气贯长虹"; - icon = "气贯长虹.dds"; + icon = "气贯长虹"; max_level = 1; type = 2; apcost = 100; @@ -103,7 +103,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "气惯长虹.sgc"; + effect = "气惯长虹"; doenchant = 1; dobless = 0; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill926.cs b/Assets/PerfectWorld/Scripts/Skills/skill926.cs index 578ee9d726..3ceace73c9 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill926.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill926.cs @@ -85,7 +85,7 @@ namespace BrewMonster cls = 1; name = "灵气震爆"; nativename = "灵气震爆"; - icon = "灵气震爆.dds"; + icon = "灵气震爆"; max_level = 1; type = 1; apcost = 100; @@ -106,7 +106,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "元素虚空.sgc"; + effect = "元素虚空"; doenchant = 1; dobless = 0; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill93.cs b/Assets/PerfectWorld/Scripts/Skills/skill93.cs index 4bff32e88d..e2cc569929 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill93.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill93.cs @@ -86,7 +86,7 @@ namespace BrewMonster cls = 1; name = "玄冰水龙"; nativename = "玄冰水龙"; - icon = "玄冰水龙.dds"; + icon = "玄冰水龙"; max_level = 10; type = 1; apcost = 200; @@ -107,7 +107,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "玄冰水龙.sgc"; + effect = "玄冰水龙"; doenchant = 1; dobless = 0; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill94.cs b/Assets/PerfectWorld/Scripts/Skills/skill94.cs index 600cc9fc88..13b3901b39 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill94.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill94.cs @@ -96,7 +96,7 @@ namespace BrewMonster cls = 1; name = "*"; nativename = "*"; - icon = "冰雹.dds"; + icon = "冰雹"; max_level = 10; type = 1; apcost = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill95.cs b/Assets/PerfectWorld/Scripts/Skills/skill95.cs index 7588a99437..1dc62e966d 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill95.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill95.cs @@ -79,7 +79,7 @@ namespace BrewMonster cls = 1; name = "＊"; nativename = "＊"; - icon = "水煞.dds"; + icon = "水煞"; max_level = 10; type = 1; apcost = 0; @@ -100,7 +100,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "水煞.sgc"; + effect = "水煞"; doenchant = 0; dobless = 0; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill96.cs b/Assets/PerfectWorld/Scripts/Skills/skill96.cs index a5f17ef7a5..eba98bacbb 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill96.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill96.cs @@ -83,7 +83,7 @@ namespace BrewMonster cls = 1; name = "烈焰护甲"; nativename = "烈焰护甲"; - icon = "烈焰护甲.dds"; + icon = "烈焰护甲"; max_level = 10; type = 2; apcost = 30; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill97.cs b/Assets/PerfectWorld/Scripts/Skills/skill97.cs index 6ef11481f5..7776225dd8 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill97.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill97.cs @@ -86,7 +86,7 @@ namespace BrewMonster cls = 1; name = "落石术"; nativename = "落石术"; - icon = "落石术.dds"; + icon = "落石术"; max_level = 10; type = 1; apcost = 0; @@ -107,7 +107,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "落石术.sgc"; + effect = "落石术"; doenchant = 0; dobless = 0; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill98.cs b/Assets/PerfectWorld/Scripts/Skills/skill98.cs index a3f61511f2..1bf2bb1aef 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill98.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill98.cs @@ -86,7 +86,7 @@ namespace BrewMonster cls = 1; name = "飞沙术"; nativename = "飞沙术"; - icon = "飞沙术.dds"; + icon = "飞沙术"; max_level = 10; type = 1; apcost = 0; @@ -107,7 +107,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "飞沙术.sgc"; + effect = "飞沙术"; doenchant = 1; dobless = 0; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/Skills/skill99.cs b/Assets/PerfectWorld/Scripts/Skills/skill99.cs index db67b6e087..7e7782c494 100644 --- a/Assets/PerfectWorld/Scripts/Skills/skill99.cs +++ b/Assets/PerfectWorld/Scripts/Skills/skill99.cs @@ -86,7 +86,7 @@ namespace BrewMonster cls = 1; name = "泰山压顶"; nativename = "泰山压顶"; - icon = "泰山压顶.dds"; + icon = "泰山压顶"; max_level = 10; type = 1; apcost = 200; @@ -106,7 +106,7 @@ namespace BrewMonster long_range = 0; restrict_corpse = 0; allow_forms = 1; - effect = "泰山压顶.sgc"; + effect = "泰山压顶"; doenchant = 1; dobless = 0; commoncooldown = 0; diff --git a/Assets/PerfectWorld/Scripts/UI/Dialogs/CDlgSkillSubList.cs b/Assets/PerfectWorld/Scripts/UI/Dialogs/CDlgSkillSubList.cs index 7ecbf9ea50..408003d63d 100644 --- a/Assets/PerfectWorld/Scripts/UI/Dialogs/CDlgSkillSubList.cs +++ b/Assets/PerfectWorld/Scripts/UI/Dialogs/CDlgSkillSubList.cs @@ -14,10 +14,11 @@ namespace BrewMonster.UI { [Header("Templates")] [SerializeField] private AUISubDialog m_pSubRank; - [SerializeField] private AUISubDialog m_pSubSkill; + [SerializeField] private CDlgSkillSubListItem m_pSubSkill; [Header("Layout")] [SerializeField] private RectTransform m_contentRoot; + [SerializeField] private RectTransform m_contentRootSkill; [SerializeField] private ScrollRect m_scrollRect; [SerializeField] private float m_windowScale = 1f; @@ -25,8 +26,8 @@ namespace BrewMonster.UI [SerializeField] private bool m_isEvil; private readonly Dictionary m_rankSubDialogs = new(); - private readonly List m_skillSubDialogs = new(); - private readonly Dictionary m_skillSubDialogsMap = new(); + private readonly List m_skillSubDialogs = new(); + private readonly Dictionary m_skillSubDialogsMap = new(); private int m_skillSubCount; // 当前显示的技能数量 / Current shown skill count private float m_curBottom; // 当前底部位置 / Current bottom position @@ -77,10 +78,6 @@ namespace BrewMonster.UI m_originBottom = m_pSubRank.GetPos().y; } - if (m_pSubSkill != null) - { - m_skillHeight = m_pSubSkill.GetSize().y; - } if (m_contentRoot != null) { @@ -115,7 +112,6 @@ namespace BrewMonster.UI taoistRank != CECTaoistRank.GetBaseRankEnd(); taoistRank = taoistRank.GetNext()) { - BMLogger.LogError("CDlgSkillSubList::InitRankDlgs: Creating GetBaseRankBegin rank " + taoistRank.GetID()); CreateOneRankDlg(taoistRank); } @@ -123,7 +119,6 @@ namespace BrewMonster.UI taoistRank != CECTaoistRank.GetGodRankEnd(); taoistRank = taoistRank.GetNext()) { - BMLogger.LogError("CDlgSkillSubList::InitRankDlgs: Creating GetGodRankBegin rank " + taoistRank.GetID()); CreateOneRankDlg(taoistRank); } @@ -131,7 +126,6 @@ namespace BrewMonster.UI taoistRank != CECTaoistRank.GetEvilRankEnd(); taoistRank = taoistRank.GetNext()) { - BMLogger.LogError("CDlgSkillSubList::InitRankDlgs: Creating GetEvilRankBegin rank " + taoistRank.GetID()); CreateOneRankDlg(taoistRank); } } @@ -170,7 +164,6 @@ namespace BrewMonster.UI taoistRank = taoistRank.GetNext()) { BMLogger.LogError("CDlgSkillSubList::ResetDialog: Adding GetBaseRankBegin rank " + taoistRank.GetID()); - AddDlgsOfOneRank(taoistRank); } @@ -216,9 +209,14 @@ namespace BrewMonster.UI return; } - CDlgSkillSubListItem subListItem = (CDlgSkillSubListItem)pSub.GetSubDialog(); - subListItem?.UpdateSkill(skillID); - + CDlgSkillSubListItem subListItem = pSub; + if(subListItem == null ) + { + BMLogger.LogError("HoangDev: UpdateOneSubDlg subListItem is null for skillID " + skillID); + return; + } + subListItem.UpdateSkill(skillID); + subListItem.Show(true); if (GetSelectedSkillID() == skillID) { // 选中时可在此扩展树状展示 / Hook skill tree here if needed @@ -228,22 +226,21 @@ namespace BrewMonster.UI // ����һ�����漶��Ի��� / Show a rank sub dialog private void AddRankSubDig(int rankID) { - BMLogger.LogError("HoangDev: AddRankSubDig"); if (!m_rankSubDialogs.TryGetValue(rankID, out var pSub)) { return; } pSub.Show(true); + pSub.SetLabel(CECTaoistRank.GetTaoistRank(rankID).GetName()); //pSub.SetPos(0f, m_curBottom); //m_curBottom += m_rankHeight * m_windowScale; - BMLogger.LogError("HoangDev: AddRankSubDig Done: " + CECTaoistRank.GetTaoistRank(rankID).GetName()); pSub.SetLabel(CECTaoistRank.GetTaoistRank(rankID).GetName()); } // ����һ�����ܶԻ��򣬵��øú����������UpdateOneSubDlg / Add a skill sub dialog then update it - private void AddSkillSubDlg(int skillID) + private void AddSkillSubDlg(int skillID, int rankID) { if (m_pSubSkill == null || m_contentRoot == null) { @@ -252,23 +249,12 @@ namespace BrewMonster.UI if (m_skillSubCount >= m_skillSubDialogs.Count) { - AUISubDialog pSubSkill = Instantiate(m_pSubSkill, m_contentRoot); - //CDlgSkillSubListItem pDlg = Instantiate(cDlgSkillSubListItem, cDlgSkillSubListItemRoot); - string dlgName = $"{m_pSubSkill.GetName()}{m_skillSubDialogs.Count}"; - pSubSkill.SetName(dlgName); - //pSubSkill.SetDialog(pDlg); - + CDlgSkillSubListItem pSubSkill = Instantiate(m_pSubSkill, m_rankSubDialogs[rankID].transform); m_skillSubDialogs.Add(pSubSkill); } - AUISubDialog curSubSkill = m_skillSubDialogs[m_skillSubCount]; - CDlgSkillSubListItem item = curSubSkill.GetComponent(); - item?.SetHighlight(false); - - curSubSkill.SetPos(0f, m_curBottom); - curSubSkill.Show(true); - curSubSkill.SetData(Mathf.RoundToInt(m_curBottom)); - m_curBottom += m_skillHeight * m_windowScale; + CDlgSkillSubListItem curSubSkill = m_skillSubDialogs[m_skillSubCount]; + curSubSkill?.SetHighlight(false); m_skillSubDialogsMap[skillID] = curSubSkill; m_skillSubCount++; @@ -311,6 +297,7 @@ namespace BrewMonster.UI { if (ElementSkill.IsOverridden((uint)skillID)) { + BMLogger.LogError("HoangDev: AddDlgsOfOneRank ElementSkill.IsOverridden for skillID " + skillID); continue; } /* bool bOnlyShowSkillCanLearn = GetGameUIMan()->m_pDlgSkillAction->IsOnlyShowSkillCanLearn(); @@ -336,9 +323,10 @@ namespace BrewMonster.UI } AddRankSubDig(rankID); + rankSkills.Sort(); foreach (int skillID in rankSkills) { - AddSkillSubDlg(skillID); + AddSkillSubDlg(skillID , rankID); } } @@ -361,20 +349,6 @@ namespace BrewMonster.UI { return; } - - float subTop = sub.GetPos().y; - float subBottom = subTop + sub.GetSize().y; - float expandedHeight = m_curBottom; - float viewportHeight = m_scrollRect.viewport != null ? m_scrollRect.viewport.rect.height : expandedHeight; - - if (viewportHeight >= expandedHeight || expandedHeight <= 0f) - { - return; - } - - float mid = (subTop + subBottom) * 0.5f; - float target = Mathf.Clamp01(mid / expandedHeight); - m_scrollRect.verticalNormalizedPosition = 1f - target; } // ׼�����Ľ��� / Prepare for layout change diff --git a/Assets/PerfectWorld/Scripts/UI/GamePlay/SkillUI/AUISubDialog.cs b/Assets/PerfectWorld/Scripts/UI/GamePlay/SkillUI/AUISubDialog.cs index 71b7311adc..d5270a87e6 100644 --- a/Assets/PerfectWorld/Scripts/UI/GamePlay/SkillUI/AUISubDialog.cs +++ b/Assets/PerfectWorld/Scripts/UI/GamePlay/SkillUI/AUISubDialog.cs @@ -9,7 +9,6 @@ namespace BrewMonster { [SerializeField] private CDlgSkillSubListItem m_subDialog; [SerializeField] private RectTransform m_rectTransform; - [SerializeField] private TextMeshProUGUI levelName; [SerializeField] private TextMeshProUGUI label; private int m_data; diff --git a/Assets/PerfectWorld/Scripts/UI/GamePlay/SkillUI/CDlgSkillSubListItem.cs b/Assets/PerfectWorld/Scripts/UI/GamePlay/SkillUI/CDlgSkillSubListItem.cs index 5f48b40c8b..2d0d19dd24 100644 --- a/Assets/PerfectWorld/Scripts/UI/GamePlay/SkillUI/CDlgSkillSubListItem.cs +++ b/Assets/PerfectWorld/Scripts/UI/GamePlay/SkillUI/CDlgSkillSubListItem.cs @@ -1,25 +1,50 @@ using BrewMonster.Scripts.Skills; +using System; using TMPro; using UnityEngine; +using UnityEngine.Splines; using UnityEngine.UI; +using static TMPro.SpriteAssetUtilities.TexturePacker_JsonArray; namespace BrewMonster { [DisallowMultipleComponent] public class CDlgSkillSubListItem : MonoBehaviour { - [SerializeField] private TextMeshProUGUI m_nameText; + [SerializeField] private TextMeshProUGUI m_skillNameLbl; + [SerializeField] private Image skillIcon; [SerializeField] private GameObject m_highlight; private int m_skillID; public void UpdateSkill(int skillID) { - m_skillID = skillID; - if (m_nameText != null) + CECHostSkillModel model = CECHostSkillModel.Instance; + var spriteName = model.GetSkillIcon(skillID); + var sprites = Resources.LoadAll("iconlist_skill_multisprite"); + if (sprites == null || sprites.Length == 0) + return; + + for (int i = 0; i < sprites.Length; i++) { - m_nameText.text = CECHostSkillModel.Instance?.GetSkillName(skillID) ?? $"Skill {skillID}"; + if (sprites[i].name == spriteName) + { + skillIcon.sprite = sprites[i]; + break; + } } + + m_skillID = skillID; + string skillName = model.GetSkillName(m_skillID); + /* if (model.IsPassiveSkill(m_skillID)) + { + skillName += ACString(GetStringFromTable(11322)); + }*/ + if (m_skillNameLbl == null) + { + BMLogger.LogError("HoangDev: CDlgSkillSubListItem m_skillNameLbl is null for skillID " + skillID); + } + m_skillNameLbl.text = skillName; } public void SetHighlight(bool bHighlight) @@ -29,7 +54,10 @@ namespace BrewMonster m_highlight.SetActive(bHighlight); } } - + public void Show(bool active) + { + gameObject.SetActive(active); + } public void EnableUpgrade(bool bEnable) { Button btn = GetComponentInChildren