From 81eb5720fcac39954ebb0df0e20211a360ca27ea Mon Sep 17 00:00:00 2001 From: VDH Date: Wed, 7 Jan 2026 14:45:32 +0700 Subject: [PATCH] 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);