From cbd58df62f8d5be5274b7c4f179186b7107ec6f1 Mon Sep 17 00:00:00 2001 From: Mikhail Date: Sat, 28 Dec 2024 15:05:33 -0500 Subject: [PATCH] update resource, fix body labels --- EpinelPS/LobbyServer/Gacha/ExecGacha.cs | 16 ++++++++++++++-- .../LobbyServer/Messenger/EnterSubquest.cs | 18 ++++++++++++++++++ .../Shop/PackageShop/SetPopupPackageState.cs | 16 ++++++++++++++++ EpinelPS/LobbyServer/Stage/ClearStage.cs | 4 ++-- EpinelPS/gameconfig.json | 8 ++++---- 5 files changed, 54 insertions(+), 8 deletions(-) create mode 100644 EpinelPS/LobbyServer/Messenger/EnterSubquest.cs create mode 100644 EpinelPS/LobbyServer/Shop/PackageShop/SetPopupPackageState.cs diff --git a/EpinelPS/LobbyServer/Gacha/ExecGacha.cs b/EpinelPS/LobbyServer/Gacha/ExecGacha.cs index 08a6214..aec29ed 100644 --- a/EpinelPS/LobbyServer/Gacha/ExecGacha.cs +++ b/EpinelPS/LobbyServer/Gacha/ExecGacha.cs @@ -84,6 +84,18 @@ namespace EpinelPS.LobbyServer.Gacha var existingItem = user.Items.FirstOrDefault(item => item.ItemType == characterData.piece_id); + response.Characters.Add(new NetUserCharacterDefaultData() + { + CostumeId = character.CostumeId, + Csn = character.Csn, + Grade = character.Grade, + Level = character.Level, + UltiSkillLv = character.UltimateLevel, + Skill1Lv = character.Skill1Lvl, + Skill2Lv = character.Skill2Lvl, + Tid = characterData.id, + }); + bool increase_item = false; gacha.Sn = character.Csn; @@ -164,7 +176,7 @@ namespace EpinelPS.LobbyServer.Gacha else { gacha.CurrencyValue = characterData.original_rare == "SSR" ? 6000 : (characterData.original_rare == "SR" ? 200 : 150); - user.AddCurrency(CurrencyType.CharacterExp, gacha.CurrencyValue); + user.AddCurrency(CurrencyType.DissolutionPoint, gacha.CurrencyValue); totalBodyLabels += (int)gacha.CurrencyValue; } @@ -223,7 +235,7 @@ namespace EpinelPS.LobbyServer.Gacha var currencyType = TicketType == 5100 ? (int)CurrencyType.SilverMileageTicket : (int)CurrencyType.GoldMileageTicket; var currencyTypeToAdd = TicketType == 5100 ? CurrencyType.SilverMileageTicket : CurrencyType.GoldMileageTicket; response.Reward.Currency.Add(new NetCurrencyData() { Type = currencyType, Value = numberOfPulls }); - response.Reward.Currency.Add(new NetCurrencyData() { Type = (int)CurrencyType.CharacterExp, Value = totalBodyLabels }); + response.Reward.Currency.Add(new NetCurrencyData() { Type = (int)CurrencyType.DissolutionPoint, Value = totalBodyLabels }); user.AddCurrency(currencyTypeToAdd, numberOfPulls); user.GachaTutorialPlayCount++; diff --git a/EpinelPS/LobbyServer/Messenger/EnterSubquest.cs b/EpinelPS/LobbyServer/Messenger/EnterSubquest.cs new file mode 100644 index 0000000..f6614f8 --- /dev/null +++ b/EpinelPS/LobbyServer/Messenger/EnterSubquest.cs @@ -0,0 +1,18 @@ +using EpinelPS.Utils; + +namespace EpinelPS.LobbyServer.Messenger +{ + [PacketPath("/messenger/subquest/enter")] + public class EnterSubquest : LobbyMsgHandler + { + protected override async Task HandleAsync() + { + var req = await ReadData(); + + // TODO: save these things + var response = new ResEnterSubQuestMessengerDialog(); + + await WriteDataAsync(response); + } + } +} diff --git a/EpinelPS/LobbyServer/Shop/PackageShop/SetPopupPackageState.cs b/EpinelPS/LobbyServer/Shop/PackageShop/SetPopupPackageState.cs new file mode 100644 index 0000000..084b145 --- /dev/null +++ b/EpinelPS/LobbyServer/Shop/PackageShop/SetPopupPackageState.cs @@ -0,0 +1,16 @@ +using EpinelPS.Utils; + +namespace EpinelPS.LobbyServer.Shop.PackageShop +{ + [PacketPath("/packageshop/setpopuppackagestate")] + public class SetPopupPackageState : LobbyMsgHandler + { + protected override async Task HandleAsync() + { + var req = await ReadData(); + + var response = new ResSetPopupPackageState(); + await WriteDataAsync(response); + } + } +} diff --git a/EpinelPS/LobbyServer/Stage/ClearStage.cs b/EpinelPS/LobbyServer/Stage/ClearStage.cs index 8a6ed5f..f08809f 100644 --- a/EpinelPS/LobbyServer/Stage/ClearStage.cs +++ b/EpinelPS/LobbyServer/Stage/ClearStage.cs @@ -115,7 +115,7 @@ namespace EpinelPS.LobbyServer.Stage if (clearedStage.stage_type != "Sub") { // add outpost reward level if unlocked - if (user.MainQuestData.TryGetValue(21, out bool c)) + if (user.MainQuestData.TryGetValue(21, out bool _)) { user.OutpostBattleLevel.Exp++; if (user.OutpostBattleLevel.Exp >= 5) @@ -153,7 +153,7 @@ namespace EpinelPS.LobbyServer.Stage return response; } - private static void DoQuestSpecificUserOperations(Database.User user, int clearedStageId) + private static void DoQuestSpecificUserOperations(User user, int clearedStageId) { var quest = GameData.Instance.GetMainQuestForStageClearCondition(clearedStageId); if (quest != null) diff --git a/EpinelPS/gameconfig.json b/EpinelPS/gameconfig.json index cd1482a..71a6db8 100644 --- a/EpinelPS/gameconfig.json +++ b/EpinelPS/gameconfig.json @@ -2,10 +2,10 @@ // Asset Urls for game version 128.6.11 // Extracted from POST https://global-lobby.nikke-kr.com/v1/staticdatapack "StaticData": { - "Url": "https://cloud.nikke-kr.com/prdenv/128-cdc557f68a/staticdata/data/qa-241226-12c/362801/StaticData.pack", - "Version": "data/qa-241226-12c/362801", - "Salt1": "8MZo0st+/ouZ5QuvQ9xIyhlZPF7Ntqi0ADp23zs2vxI=", - "Salt2": "KxICDaYXN5OJEZ0Z6OuBf6dloOcADpTkx68wny15UyE=" + "Url": "https://cloud.nikke-kr.com/prdenv/128-cdc557f68a/staticdata/data/qa-241226-12c/363264/StaticData.pack", + "Version": "data/qa-241226-12c/363264", + "Salt1": "z/JS9ushhQ0TpDJz+eAaOI8OK44tsU74WGpeBLexkoo=", + "Salt2": "XubkGE1LgpXHjAeYK3YuNHtUHhGVTsWL/VUYnOzqBpc=" }, // Extracted from POST https://global-lobby.nikke-kr.com/v1/resourcehosts2