diff --git a/.gitignore b/.gitignore index 59400500..2f1e1e7d 100644 --- a/.gitignore +++ b/.gitignore @@ -220,9 +220,9 @@ Thumbs.db DEPLOY global.min.css global.min.js -bootstrap-custom.css bootstrap-custom.min.css **/Master/static **/Master/dev_env /WebfrontCore/Views/Plugins/Stats -/WebfrontCore/wwwroot/images/icons +/WebfrontCore/wwwroot/**/dds + diff --git a/Application/Application.csproj b/Application/Application.csproj index d9edbf93..b5ffe572 100644 --- a/Application/Application.csproj +++ b/Application/Application.csproj @@ -2,7 +2,7 @@ Exe - netcoreapp2.0 + netcoreapp2.1 false RaidMax.IW4MAdmin.Application 2.1.1 @@ -75,7 +75,7 @@ - + diff --git a/Application/Manager.cs b/Application/Manager.cs index 938156da..cd906531 100644 --- a/Application/Manager.cs +++ b/Application/Manager.cs @@ -94,7 +94,7 @@ namespace IW4MAdmin.Application .ToList(); // this is to prevent the log reader from starting before the initial - // query of players on the server + // query of players on the server if (serverTasksToRemove.Count > 0) { IsInitialized = true; @@ -142,7 +142,7 @@ namespace IW4MAdmin.Application { Running = true; -#region DATABASE + #region DATABASE var ipList = (await ClientSvc.Find(c => c.Level > Player.Permission.Trusted)) .Select(c => new { @@ -172,9 +172,9 @@ namespace IW4MAdmin.Application continue; } } -#endregion + #endregion -#region CONFIG + #region CONFIG var config = ConfigHandler.Configuration(); // copy over default config if it doesn't exist @@ -225,8 +225,8 @@ namespace IW4MAdmin.Application Encoding.RegisterProvider(CodePagesEncodingProvider.Instance); Utilities.EncodingType = Encoding.GetEncoding(!string.IsNullOrEmpty(config.CustomParserEncoding) ? config.CustomParserEncoding : "windows-1252"); -#endregion -#region PLUGINS + #endregion + #region PLUGINS SharedLibraryCore.Plugins.PluginImporter.Load(this); foreach (var Plugin in SharedLibraryCore.Plugins.PluginImporter.ActivePlugins) @@ -243,9 +243,9 @@ namespace IW4MAdmin.Application Logger.WriteDebug($"Stack Trace: {e.StackTrace}"); } } -#endregion + #endregion -#region COMMANDS + #region COMMANDS if (ClientSvc.GetOwners().Result.Count == 0) Commands.Add(new COwner()); @@ -289,9 +289,9 @@ namespace IW4MAdmin.Application foreach (Command C in SharedLibraryCore.Plugins.PluginImporter.ActiveCommands) Commands.Add(C); -#endregion + #endregion -#region INIT + #region INIT async Task Init(ServerConfiguration Conf) { // setup the event handler after the class is initialized @@ -327,7 +327,7 @@ namespace IW4MAdmin.Application } await Task.WhenAll(config.Servers.Select(c => Init(c)).ToArray()); -#endregion + #endregion } private async Task SendHeartbeat(object state) @@ -445,7 +445,7 @@ namespace IW4MAdmin.Application { // wait for new event to be added OnEvent.Wait(); - while((queuedEvent = Handler.GetNextEvent()) != null) + while ((queuedEvent = Handler.GetNextEvent()) != null) { if (GameEvent.ShouldOriginEventBeDelayed(queuedEvent)) { @@ -462,7 +462,17 @@ namespace IW4MAdmin.Application queuedEvent.Target.DelayedEvents.Enqueue(queuedEvent); continue; } - await processEvent(queuedEvent); + + if (queuedEvent.Type == GameEvent.EventType.Connect) + { + // we don't want to block here to due to needing event completion in the addplayer method + processEvent(queuedEvent); + } + + else + { + await processEvent(queuedEvent); + } } // signal that all events have been processed diff --git a/Application/Server.cs b/Application/Server.cs index 1e939896..15ae65bd 100644 --- a/Application/Server.cs +++ b/Application/Server.cs @@ -174,19 +174,13 @@ namespace IW4MAdmin await Manager.GetClientService().Update(client); } - else if (existingAlias.Name == polledPlayer.Name || - // fixme: why would this be null? - client.CurrentAlias == null) + else { client.CurrentAlias = existingAlias; client.CurrentAliasId = existingAlias.AliasId; - // we need to update their new ip and name to the virtual property - client.Name = polledPlayer.Name; - client.IPAddress = polledPlayer.IPAddress; - - client = await Manager.GetClientService().Update(client); + client.Name = existingAlias.Name; + client.IPAddress = existingAlias.IPAddress; } - player = client.AsPlayer(); } @@ -198,7 +192,6 @@ namespace IW4MAdmin player.Score = polledPlayer.Score; player.IsAuthenticated = true; player.CurrentServer = this; - player.State = Player.ClientState.Connected; Players[player.ClientNumber] = player; var activePenalties = await Manager.GetPenaltyService().GetActivePenaltiesAsync(player.AliasLinkId, player.IPAddress); @@ -251,8 +244,13 @@ namespace IW4MAdmin Origin = player, Owner = this }; + Manager.GetEventHandler().AddEvent(e); + // let all the plugins get the event + // this is only beause the connect event executes + e.OnProcessed.Wait(); + // add the delayed event to the queue while (delayedEventQueue?.Count > 0) { @@ -262,7 +260,8 @@ namespace IW4MAdmin if (e.Target != null) { // update the target incase they left or have newer info - e.Target = GetPlayersAsList().FirstOrDefault(p => p.NetworkId == e.Target.NetworkId); + e.Target = GetPlayersAsList() + .FirstOrDefault(p => p.NetworkId == e.Target.NetworkId); // we have to throw out the event because they left if (e.Target == null) { @@ -293,7 +292,7 @@ namespace IW4MAdmin Player Leaving = Players[cNum]; Logger.WriteInfo($"Client {Leaving} disconnecting..."); - if (!Leaving.IsAuthenticated) + if (!Leaving.IsAuthenticated || Leaving.State != Player.ClientState.Connected) { Players[cNum] = null; } diff --git a/Plugins/IW4ScriptCommands/IW4ScriptCommands.csproj b/Plugins/IW4ScriptCommands/IW4ScriptCommands.csproj index e50fa904..a69ad40e 100644 --- a/Plugins/IW4ScriptCommands/IW4ScriptCommands.csproj +++ b/Plugins/IW4ScriptCommands/IW4ScriptCommands.csproj @@ -1,8 +1,8 @@ - + Library - netcoreapp2.0 + netcoreapp2.1 @@ -17,7 +17,7 @@ - + diff --git a/Plugins/Login/Login.csproj b/Plugins/Login/Login.csproj index 2e7b0102..526f623d 100644 --- a/Plugins/Login/Login.csproj +++ b/Plugins/Login/Login.csproj @@ -1,8 +1,8 @@ - + Library - netcoreapp2.0 + netcoreapp2.1 RaidMax.IW4MAdmin.Plugins.Login @@ -21,7 +21,7 @@ - + diff --git a/Plugins/ProfanityDeterment/ProfanityDeterment.csproj b/Plugins/ProfanityDeterment/ProfanityDeterment.csproj index 6181337f..041617bd 100644 --- a/Plugins/ProfanityDeterment/ProfanityDeterment.csproj +++ b/Plugins/ProfanityDeterment/ProfanityDeterment.csproj @@ -1,8 +1,8 @@ - + Library - netcoreapp2.0 + netcoreapp2.1 RaidMax.IW4MAdmin.Plugins.ProfanityDeterment @@ -19,7 +19,7 @@ - + diff --git a/Plugins/Stats/Cheat/Detection.cs b/Plugins/Stats/Cheat/Detection.cs index 8eabb537..0ebd0ab9 100644 --- a/Plugins/Stats/Cheat/Detection.cs +++ b/Plugins/Stats/Cheat/Detection.cs @@ -140,7 +140,8 @@ namespace IW4MAdmin.Plugins.Stats.Cheat } // flag - if (currentStrain > Thresholds.MaxStrainFlag) + if (currentStrain > Thresholds.MaxStrainFlag + && HitCount >= 10) { result = new DetectionPenaltyResult() { @@ -153,7 +154,7 @@ namespace IW4MAdmin.Plugins.Stats.Cheat // ban if (currentStrain > Thresholds.MaxStrainBan && - HitCount > 15) + HitCount >= 15) { result = new DetectionPenaltyResult() { diff --git a/Plugins/Stats/Stats.csproj b/Plugins/Stats/Stats.csproj index 0d26f2ab..d7a61c4c 100644 --- a/Plugins/Stats/Stats.csproj +++ b/Plugins/Stats/Stats.csproj @@ -1,8 +1,8 @@ - + Library - netcoreapp2.0 + netcoreapp2.1 RaidMax.IW4MAdmin.Plugins.Stats @@ -14,10 +14,6 @@ Debug;Release;Prerelease - - - - PreserveNewest @@ -30,7 +26,7 @@ - + diff --git a/Plugins/Tests/Tests.csproj b/Plugins/Tests/Tests.csproj index f68f438c..96a2628c 100644 --- a/Plugins/Tests/Tests.csproj +++ b/Plugins/Tests/Tests.csproj @@ -1,8 +1,8 @@ - + Library - netcoreapp2.0 + netcoreapp2.1 @@ -20,7 +20,7 @@ - + diff --git a/Plugins/Welcome/Welcome.csproj b/Plugins/Welcome/Welcome.csproj index cfe583d8..532a4b3c 100644 --- a/Plugins/Welcome/Welcome.csproj +++ b/Plugins/Welcome/Welcome.csproj @@ -1,8 +1,8 @@ - + Library - netcoreapp2.0 + netcoreapp2.1 RaidMax.IW4MAdmin.Plugins.Welcome @@ -25,7 +25,7 @@ - + diff --git a/SharedLibraryCore/SharedLibraryCore.csproj b/SharedLibraryCore/SharedLibraryCore.csproj index 13c86964..e0e0cdda 100644 --- a/SharedLibraryCore/SharedLibraryCore.csproj +++ b/SharedLibraryCore/SharedLibraryCore.csproj @@ -1,8 +1,8 @@ - + Library - netcoreapp2.0 + netcoreapp2.1 RaidMax.IW4MAdmin.SharedLibraryCore @@ -17,19 +17,19 @@ - - - - - - + + + + + + - + - + diff --git a/WebfrontCore/.bowerrc b/WebfrontCore/.bowerrc index 6406626a..46ac6f55 100644 --- a/WebfrontCore/.bowerrc +++ b/WebfrontCore/.bowerrc @@ -1,3 +1,4 @@ { - "directory": "wwwroot/lib" + "directory": "wwwroot/lib", + "registry": "https://registry.bower.io" } diff --git a/WebfrontCore/Startup.cs b/WebfrontCore/Startup.cs index 570ba69c..22e78796 100644 --- a/WebfrontCore/Startup.cs +++ b/WebfrontCore/Startup.cs @@ -2,7 +2,6 @@ using Microsoft.AspNetCore.Builder; using Microsoft.AspNetCore.Hosting; using Microsoft.AspNetCore.Mvc.Razor; -using Microsoft.EntityFrameworkCore; using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Logging; @@ -63,7 +62,6 @@ namespace WebfrontCore { loggerFactory.AddDebug(); app.UseDeveloperExceptionPage(); - app.UseBrowserLink(); } else { diff --git a/WebfrontCore/WebfrontCore.csproj b/WebfrontCore/WebfrontCore.csproj index 8d174a82..9129dccc 100644 --- a/WebfrontCore/WebfrontCore.csproj +++ b/WebfrontCore/WebfrontCore.csproj @@ -1,7 +1,7 @@  - netcoreapp2.0 + netcoreapp2.1 false true 2.6 @@ -51,9 +51,20 @@ - - - + + + + + + + + + + + + + + @@ -62,9 +73,6 @@ - - - diff --git a/WebfrontCore/wwwroot/images/icons/0_no-place/menu_div_no_place.png b/WebfrontCore/wwwroot/images/icons/0_no-place/menu_div_no_place.png new file mode 100644 index 00000000..cc9e0e56 Binary files /dev/null and b/WebfrontCore/wwwroot/images/icons/0_no-place/menu_div_no_place.png differ diff --git a/WebfrontCore/wwwroot/images/icons/0_no-place/menu_div_no_place_64.png b/WebfrontCore/wwwroot/images/icons/0_no-place/menu_div_no_place_64.png new file mode 100644 index 00000000..64b6dfe6 Binary files /dev/null and b/WebfrontCore/wwwroot/images/icons/0_no-place/menu_div_no_place_64.png differ diff --git a/WebfrontCore/wwwroot/images/icons/1_iron/menu_div_iron.png b/WebfrontCore/wwwroot/images/icons/1_iron/menu_div_iron.png new file mode 100644 index 00000000..0e3fb3c0 Binary files /dev/null and b/WebfrontCore/wwwroot/images/icons/1_iron/menu_div_iron.png differ diff --git a/WebfrontCore/wwwroot/images/icons/1_iron/menu_div_iron_64.png b/WebfrontCore/wwwroot/images/icons/1_iron/menu_div_iron_64.png new file mode 100644 index 00000000..4fd07dd0 Binary files /dev/null and b/WebfrontCore/wwwroot/images/icons/1_iron/menu_div_iron_64.png differ diff --git a/WebfrontCore/wwwroot/images/icons/1_iron/menu_div_iron_sub01.png b/WebfrontCore/wwwroot/images/icons/1_iron/menu_div_iron_sub01.png new file mode 100644 index 00000000..c440d454 Binary files /dev/null and b/WebfrontCore/wwwroot/images/icons/1_iron/menu_div_iron_sub01.png differ diff --git a/WebfrontCore/wwwroot/images/icons/1_iron/menu_div_iron_sub01_64.png b/WebfrontCore/wwwroot/images/icons/1_iron/menu_div_iron_sub01_64.png new file mode 100644 index 00000000..77a60574 Binary files /dev/null and b/WebfrontCore/wwwroot/images/icons/1_iron/menu_div_iron_sub01_64.png differ diff --git a/WebfrontCore/wwwroot/images/icons/1_iron/menu_div_iron_sub02.png b/WebfrontCore/wwwroot/images/icons/1_iron/menu_div_iron_sub02.png new file mode 100644 index 00000000..01f36607 Binary files /dev/null and b/WebfrontCore/wwwroot/images/icons/1_iron/menu_div_iron_sub02.png differ diff --git a/WebfrontCore/wwwroot/images/icons/1_iron/menu_div_iron_sub02_64.png b/WebfrontCore/wwwroot/images/icons/1_iron/menu_div_iron_sub02_64.png new file mode 100644 index 00000000..52e9f604 Binary files /dev/null and b/WebfrontCore/wwwroot/images/icons/1_iron/menu_div_iron_sub02_64.png differ diff --git a/WebfrontCore/wwwroot/images/icons/1_iron/menu_div_iron_sub03.png b/WebfrontCore/wwwroot/images/icons/1_iron/menu_div_iron_sub03.png new file mode 100644 index 00000000..9ee5d882 Binary files /dev/null and b/WebfrontCore/wwwroot/images/icons/1_iron/menu_div_iron_sub03.png differ diff --git a/WebfrontCore/wwwroot/images/icons/1_iron/menu_div_iron_sub03_64.png b/WebfrontCore/wwwroot/images/icons/1_iron/menu_div_iron_sub03_64.png new file mode 100644 index 00000000..e04bd522 Binary files /dev/null and b/WebfrontCore/wwwroot/images/icons/1_iron/menu_div_iron_sub03_64.png differ diff --git a/WebfrontCore/wwwroot/images/icons/2_bronze/menu_div_bronze.png b/WebfrontCore/wwwroot/images/icons/2_bronze/menu_div_bronze.png new file mode 100644 index 00000000..daa65c02 Binary files /dev/null and b/WebfrontCore/wwwroot/images/icons/2_bronze/menu_div_bronze.png differ diff --git a/WebfrontCore/wwwroot/images/icons/2_bronze/menu_div_bronze_64.png b/WebfrontCore/wwwroot/images/icons/2_bronze/menu_div_bronze_64.png new file mode 100644 index 00000000..374beb5a Binary files /dev/null and b/WebfrontCore/wwwroot/images/icons/2_bronze/menu_div_bronze_64.png differ diff --git a/WebfrontCore/wwwroot/images/icons/2_bronze/menu_div_bronze_sub01.png b/WebfrontCore/wwwroot/images/icons/2_bronze/menu_div_bronze_sub01.png new file mode 100644 index 00000000..801d2385 Binary files /dev/null and b/WebfrontCore/wwwroot/images/icons/2_bronze/menu_div_bronze_sub01.png differ diff --git a/WebfrontCore/wwwroot/images/icons/2_bronze/menu_div_bronze_sub01_64.png b/WebfrontCore/wwwroot/images/icons/2_bronze/menu_div_bronze_sub01_64.png new file mode 100644 index 00000000..b647d0e7 Binary files /dev/null and b/WebfrontCore/wwwroot/images/icons/2_bronze/menu_div_bronze_sub01_64.png differ diff --git a/WebfrontCore/wwwroot/images/icons/2_bronze/menu_div_bronze_sub02.png b/WebfrontCore/wwwroot/images/icons/2_bronze/menu_div_bronze_sub02.png new file mode 100644 index 00000000..d3c10819 Binary files /dev/null and b/WebfrontCore/wwwroot/images/icons/2_bronze/menu_div_bronze_sub02.png differ diff --git a/WebfrontCore/wwwroot/images/icons/2_bronze/menu_div_bronze_sub02_64.png b/WebfrontCore/wwwroot/images/icons/2_bronze/menu_div_bronze_sub02_64.png new file mode 100644 index 00000000..eb270fb4 Binary files /dev/null and b/WebfrontCore/wwwroot/images/icons/2_bronze/menu_div_bronze_sub02_64.png differ diff --git a/WebfrontCore/wwwroot/images/icons/2_bronze/menu_div_bronze_sub03.png b/WebfrontCore/wwwroot/images/icons/2_bronze/menu_div_bronze_sub03.png new file mode 100644 index 00000000..c644c8ed Binary files /dev/null and b/WebfrontCore/wwwroot/images/icons/2_bronze/menu_div_bronze_sub03.png differ diff --git a/WebfrontCore/wwwroot/images/icons/2_bronze/menu_div_bronze_sub03_64.png b/WebfrontCore/wwwroot/images/icons/2_bronze/menu_div_bronze_sub03_64.png new file mode 100644 index 00000000..06cd5e2f Binary files /dev/null and b/WebfrontCore/wwwroot/images/icons/2_bronze/menu_div_bronze_sub03_64.png differ diff --git a/WebfrontCore/wwwroot/images/icons/3_silver/menu_div_silver.png b/WebfrontCore/wwwroot/images/icons/3_silver/menu_div_silver.png new file mode 100644 index 00000000..87683e19 Binary files /dev/null and b/WebfrontCore/wwwroot/images/icons/3_silver/menu_div_silver.png differ diff --git a/WebfrontCore/wwwroot/images/icons/3_silver/menu_div_silver_64.png b/WebfrontCore/wwwroot/images/icons/3_silver/menu_div_silver_64.png new file mode 100644 index 00000000..19b996d8 Binary files /dev/null and b/WebfrontCore/wwwroot/images/icons/3_silver/menu_div_silver_64.png differ diff --git a/WebfrontCore/wwwroot/images/icons/3_silver/menu_div_silver_sub01.png b/WebfrontCore/wwwroot/images/icons/3_silver/menu_div_silver_sub01.png new file mode 100644 index 00000000..1b7123b5 Binary files /dev/null and b/WebfrontCore/wwwroot/images/icons/3_silver/menu_div_silver_sub01.png differ diff --git a/WebfrontCore/wwwroot/images/icons/3_silver/menu_div_silver_sub01_64.png b/WebfrontCore/wwwroot/images/icons/3_silver/menu_div_silver_sub01_64.png new file mode 100644 index 00000000..e6b9b29b Binary files /dev/null and b/WebfrontCore/wwwroot/images/icons/3_silver/menu_div_silver_sub01_64.png differ diff --git a/WebfrontCore/wwwroot/images/icons/3_silver/menu_div_silver_sub02.png b/WebfrontCore/wwwroot/images/icons/3_silver/menu_div_silver_sub02.png new file mode 100644 index 00000000..77b66efc Binary files /dev/null and b/WebfrontCore/wwwroot/images/icons/3_silver/menu_div_silver_sub02.png differ diff --git a/WebfrontCore/wwwroot/images/icons/3_silver/menu_div_silver_sub02_64.png b/WebfrontCore/wwwroot/images/icons/3_silver/menu_div_silver_sub02_64.png new file mode 100644 index 00000000..ac03e9c1 Binary files /dev/null and b/WebfrontCore/wwwroot/images/icons/3_silver/menu_div_silver_sub02_64.png differ diff --git a/WebfrontCore/wwwroot/images/icons/3_silver/menu_div_silver_sub03.png b/WebfrontCore/wwwroot/images/icons/3_silver/menu_div_silver_sub03.png new file mode 100644 index 00000000..8eb75894 Binary files /dev/null and b/WebfrontCore/wwwroot/images/icons/3_silver/menu_div_silver_sub03.png differ diff --git a/WebfrontCore/wwwroot/images/icons/3_silver/menu_div_silver_sub03_64.png b/WebfrontCore/wwwroot/images/icons/3_silver/menu_div_silver_sub03_64.png new file mode 100644 index 00000000..4b88f605 Binary files /dev/null and b/WebfrontCore/wwwroot/images/icons/3_silver/menu_div_silver_sub03_64.png differ diff --git a/WebfrontCore/wwwroot/images/icons/4_gold/menu_div_gold.png b/WebfrontCore/wwwroot/images/icons/4_gold/menu_div_gold.png new file mode 100644 index 00000000..9b572f6d Binary files /dev/null and b/WebfrontCore/wwwroot/images/icons/4_gold/menu_div_gold.png differ diff --git a/WebfrontCore/wwwroot/images/icons/4_gold/menu_div_gold_64.png b/WebfrontCore/wwwroot/images/icons/4_gold/menu_div_gold_64.png new file mode 100644 index 00000000..2cfd7a53 Binary files /dev/null and b/WebfrontCore/wwwroot/images/icons/4_gold/menu_div_gold_64.png differ diff --git a/WebfrontCore/wwwroot/images/icons/4_gold/menu_div_gold_sub01.png b/WebfrontCore/wwwroot/images/icons/4_gold/menu_div_gold_sub01.png new file mode 100644 index 00000000..a4ed5d3f Binary files /dev/null and b/WebfrontCore/wwwroot/images/icons/4_gold/menu_div_gold_sub01.png differ diff --git a/WebfrontCore/wwwroot/images/icons/4_gold/menu_div_gold_sub01_64.png b/WebfrontCore/wwwroot/images/icons/4_gold/menu_div_gold_sub01_64.png new file mode 100644 index 00000000..a9c6b90e Binary files /dev/null and b/WebfrontCore/wwwroot/images/icons/4_gold/menu_div_gold_sub01_64.png differ diff --git a/WebfrontCore/wwwroot/images/icons/4_gold/menu_div_gold_sub02.png b/WebfrontCore/wwwroot/images/icons/4_gold/menu_div_gold_sub02.png new file mode 100644 index 00000000..198ce4c5 Binary files /dev/null and b/WebfrontCore/wwwroot/images/icons/4_gold/menu_div_gold_sub02.png differ diff --git a/WebfrontCore/wwwroot/images/icons/4_gold/menu_div_gold_sub02_64.png b/WebfrontCore/wwwroot/images/icons/4_gold/menu_div_gold_sub02_64.png new file mode 100644 index 00000000..d9e2b862 Binary files /dev/null and b/WebfrontCore/wwwroot/images/icons/4_gold/menu_div_gold_sub02_64.png differ diff --git a/WebfrontCore/wwwroot/images/icons/4_gold/menu_div_gold_sub03.png b/WebfrontCore/wwwroot/images/icons/4_gold/menu_div_gold_sub03.png new file mode 100644 index 00000000..f44ef164 Binary files /dev/null and b/WebfrontCore/wwwroot/images/icons/4_gold/menu_div_gold_sub03.png differ diff --git a/WebfrontCore/wwwroot/images/icons/4_gold/menu_div_gold_sub03_64.png b/WebfrontCore/wwwroot/images/icons/4_gold/menu_div_gold_sub03_64.png new file mode 100644 index 00000000..2b858d04 Binary files /dev/null and b/WebfrontCore/wwwroot/images/icons/4_gold/menu_div_gold_sub03_64.png differ diff --git a/WebfrontCore/wwwroot/images/icons/5_platinum/menu_div_platinum.png b/WebfrontCore/wwwroot/images/icons/5_platinum/menu_div_platinum.png new file mode 100644 index 00000000..58ad2ada Binary files /dev/null and b/WebfrontCore/wwwroot/images/icons/5_platinum/menu_div_platinum.png differ diff --git a/WebfrontCore/wwwroot/images/icons/5_platinum/menu_div_platinum_64.png b/WebfrontCore/wwwroot/images/icons/5_platinum/menu_div_platinum_64.png new file mode 100644 index 00000000..de94aa26 Binary files /dev/null and b/WebfrontCore/wwwroot/images/icons/5_platinum/menu_div_platinum_64.png differ diff --git a/WebfrontCore/wwwroot/images/icons/5_platinum/menu_div_platinum_sub01.png b/WebfrontCore/wwwroot/images/icons/5_platinum/menu_div_platinum_sub01.png new file mode 100644 index 00000000..b726af86 Binary files /dev/null and b/WebfrontCore/wwwroot/images/icons/5_platinum/menu_div_platinum_sub01.png differ diff --git a/WebfrontCore/wwwroot/images/icons/5_platinum/menu_div_platinum_sub01_64.png b/WebfrontCore/wwwroot/images/icons/5_platinum/menu_div_platinum_sub01_64.png new file mode 100644 index 00000000..321166e8 Binary files /dev/null and b/WebfrontCore/wwwroot/images/icons/5_platinum/menu_div_platinum_sub01_64.png differ diff --git a/WebfrontCore/wwwroot/images/icons/5_platinum/menu_div_platinum_sub02.png b/WebfrontCore/wwwroot/images/icons/5_platinum/menu_div_platinum_sub02.png new file mode 100644 index 00000000..36cfc5e2 Binary files /dev/null and b/WebfrontCore/wwwroot/images/icons/5_platinum/menu_div_platinum_sub02.png differ diff --git a/WebfrontCore/wwwroot/images/icons/5_platinum/menu_div_platinum_sub02_64.png b/WebfrontCore/wwwroot/images/icons/5_platinum/menu_div_platinum_sub02_64.png new file mode 100644 index 00000000..9de5cd27 Binary files /dev/null and b/WebfrontCore/wwwroot/images/icons/5_platinum/menu_div_platinum_sub02_64.png differ diff --git a/WebfrontCore/wwwroot/images/icons/5_platinum/menu_div_platinum_sub03.png b/WebfrontCore/wwwroot/images/icons/5_platinum/menu_div_platinum_sub03.png new file mode 100644 index 00000000..5738a84a Binary files /dev/null and b/WebfrontCore/wwwroot/images/icons/5_platinum/menu_div_platinum_sub03.png differ diff --git a/WebfrontCore/wwwroot/images/icons/5_platinum/menu_div_platinum_sub03_64.png b/WebfrontCore/wwwroot/images/icons/5_platinum/menu_div_platinum_sub03_64.png new file mode 100644 index 00000000..e2ef3b7d Binary files /dev/null and b/WebfrontCore/wwwroot/images/icons/5_platinum/menu_div_platinum_sub03_64.png differ diff --git a/WebfrontCore/wwwroot/images/icons/6_semipro/menu_div_semipro.png b/WebfrontCore/wwwroot/images/icons/6_semipro/menu_div_semipro.png new file mode 100644 index 00000000..d9a01691 Binary files /dev/null and b/WebfrontCore/wwwroot/images/icons/6_semipro/menu_div_semipro.png differ diff --git a/WebfrontCore/wwwroot/images/icons/6_semipro/menu_div_semipro_64.png b/WebfrontCore/wwwroot/images/icons/6_semipro/menu_div_semipro_64.png new file mode 100644 index 00000000..e5cc66ec Binary files /dev/null and b/WebfrontCore/wwwroot/images/icons/6_semipro/menu_div_semipro_64.png differ diff --git a/WebfrontCore/wwwroot/images/icons/6_semipro/menu_div_semipro_sub01.png b/WebfrontCore/wwwroot/images/icons/6_semipro/menu_div_semipro_sub01.png new file mode 100644 index 00000000..e2ccae01 Binary files /dev/null and b/WebfrontCore/wwwroot/images/icons/6_semipro/menu_div_semipro_sub01.png differ diff --git a/WebfrontCore/wwwroot/images/icons/6_semipro/menu_div_semipro_sub01_64.png b/WebfrontCore/wwwroot/images/icons/6_semipro/menu_div_semipro_sub01_64.png new file mode 100644 index 00000000..ba95f301 Binary files /dev/null and b/WebfrontCore/wwwroot/images/icons/6_semipro/menu_div_semipro_sub01_64.png differ diff --git a/WebfrontCore/wwwroot/images/icons/6_semipro/menu_div_semipro_sub02.png b/WebfrontCore/wwwroot/images/icons/6_semipro/menu_div_semipro_sub02.png new file mode 100644 index 00000000..fb6dff40 Binary files /dev/null and b/WebfrontCore/wwwroot/images/icons/6_semipro/menu_div_semipro_sub02.png differ diff --git a/WebfrontCore/wwwroot/images/icons/6_semipro/menu_div_semipro_sub02_64.png b/WebfrontCore/wwwroot/images/icons/6_semipro/menu_div_semipro_sub02_64.png new file mode 100644 index 00000000..7c57bef0 Binary files /dev/null and b/WebfrontCore/wwwroot/images/icons/6_semipro/menu_div_semipro_sub02_64.png differ diff --git a/WebfrontCore/wwwroot/images/icons/6_semipro/menu_div_semipro_sub03.png b/WebfrontCore/wwwroot/images/icons/6_semipro/menu_div_semipro_sub03.png new file mode 100644 index 00000000..284818b7 Binary files /dev/null and b/WebfrontCore/wwwroot/images/icons/6_semipro/menu_div_semipro_sub03.png differ diff --git a/WebfrontCore/wwwroot/images/icons/6_semipro/menu_div_semipro_sub03_64.png b/WebfrontCore/wwwroot/images/icons/6_semipro/menu_div_semipro_sub03_64.png new file mode 100644 index 00000000..ea241caf Binary files /dev/null and b/WebfrontCore/wwwroot/images/icons/6_semipro/menu_div_semipro_sub03_64.png differ diff --git a/WebfrontCore/wwwroot/images/icons/7_pro/menu_div_pro.png b/WebfrontCore/wwwroot/images/icons/7_pro/menu_div_pro.png new file mode 100644 index 00000000..26e69611 Binary files /dev/null and b/WebfrontCore/wwwroot/images/icons/7_pro/menu_div_pro.png differ diff --git a/WebfrontCore/wwwroot/images/icons/7_pro/menu_div_pro_64.png b/WebfrontCore/wwwroot/images/icons/7_pro/menu_div_pro_64.png new file mode 100644 index 00000000..b6243820 Binary files /dev/null and b/WebfrontCore/wwwroot/images/icons/7_pro/menu_div_pro_64.png differ diff --git a/WebfrontCore/wwwroot/images/icons/7_pro/menu_div_pro_sub01.png b/WebfrontCore/wwwroot/images/icons/7_pro/menu_div_pro_sub01.png new file mode 100644 index 00000000..f70b3638 Binary files /dev/null and b/WebfrontCore/wwwroot/images/icons/7_pro/menu_div_pro_sub01.png differ diff --git a/WebfrontCore/wwwroot/images/icons/7_pro/menu_div_pro_sub01_64.png b/WebfrontCore/wwwroot/images/icons/7_pro/menu_div_pro_sub01_64.png new file mode 100644 index 00000000..2bac9521 Binary files /dev/null and b/WebfrontCore/wwwroot/images/icons/7_pro/menu_div_pro_sub01_64.png differ diff --git a/WebfrontCore/wwwroot/images/icons/7_pro/menu_div_pro_sub02.png b/WebfrontCore/wwwroot/images/icons/7_pro/menu_div_pro_sub02.png new file mode 100644 index 00000000..4af26287 Binary files /dev/null and b/WebfrontCore/wwwroot/images/icons/7_pro/menu_div_pro_sub02.png differ diff --git a/WebfrontCore/wwwroot/images/icons/7_pro/menu_div_pro_sub02_64.png b/WebfrontCore/wwwroot/images/icons/7_pro/menu_div_pro_sub02_64.png new file mode 100644 index 00000000..baabc426 Binary files /dev/null and b/WebfrontCore/wwwroot/images/icons/7_pro/menu_div_pro_sub02_64.png differ diff --git a/WebfrontCore/wwwroot/images/icons/7_pro/menu_div_pro_sub03.png b/WebfrontCore/wwwroot/images/icons/7_pro/menu_div_pro_sub03.png new file mode 100644 index 00000000..23ba7eae Binary files /dev/null and b/WebfrontCore/wwwroot/images/icons/7_pro/menu_div_pro_sub03.png differ diff --git a/WebfrontCore/wwwroot/images/icons/7_pro/menu_div_pro_sub03_64.png b/WebfrontCore/wwwroot/images/icons/7_pro/menu_div_pro_sub03_64.png new file mode 100644 index 00000000..3ac6ffb9 Binary files /dev/null and b/WebfrontCore/wwwroot/images/icons/7_pro/menu_div_pro_sub03_64.png differ