From 239c4f293fe7d0530376c81558da5e4881593ef3 Mon Sep 17 00:00:00 2001 From: Mikhail Date: Tue, 30 Jul 2024 13:04:25 -0400 Subject: [PATCH] Rename project to EpinelPS --- nksrv.sln => EpinelPS.sln | 81 +----------------- {nksrv => EpinelPS}/AdminApiController.cs | 4 +- {nksrv => EpinelPS}/Database/JsonDb.cs | 8 +- .../nksrv.csproj => EpinelPS/EpinelPS.csproj | 0 .../GameData/GameData.cs | 71 +++++++-------- .../GameData}/JsonStaticData.cs | 2 +- .../IntlServer/AutoLoginEndpoint.cs | 2 +- .../IntlServer/CodeStatusEndpoint.cs | 2 +- .../IntlServer/GetNoticeContent.cs | 2 +- .../IntlServer/IntlAccountRedirect.cs | 4 +- .../IntlServer/IntlAccountRegisterEndpoint.cs | 8 +- .../IntlServer/IntlGetAccountInfo.cs | 2 +- .../IntlServer/IntlGetProfileBindInfo.cs | 2 +- .../IntlServer/IntlGetProfileInfo.cs | 2 +- {nksrv => EpinelPS}/IntlServer/IntlHandler.cs | 6 +- .../IntlServer/IntlLogin1Endpoint.cs | 6 +- .../IntlServer/IntlLogin2Endpoint.cs | 4 +- .../IntlServer/IntlMsgHandler.cs | 4 +- .../IntlServer/IntlQueryAccountInfo.cs | 2 +- .../IntlServer/IntlReturnJsonHandler.cs | 2 +- .../IntlServer/JuniperLauncherGetRegion.cs | 2 +- .../JuniperLauncherGetRepoVersion.cs | 2 +- .../IntlServer/JupiterAuthLogin.cs | 2 +- .../IntlServer/JupterGetGameLauncher.cs | 2 +- .../IntlServer/SendCodeEndpoint.cs | 6 +- .../LobbyServer/LobbyHandler.cs | 6 +- .../LobbyServer/LobbyMsgHandler.cs | 6 +- .../Msgs/Antibot/BattleReportData.cs | 4 +- .../Msgs/Antibot/RecieveAntibotData.cs | 4 +- .../Archive/CheckBookmarkScenarioExists.cs | 4 +- .../LobbyServer/Msgs/Archive/GetArchives.cs | 4 +- .../LobbyServer/Msgs/Arena/GetArenaBanInfo.cs | 4 +- .../Msgs/Arena/ShowSpecialArenaReward.cs | 4 +- .../LobbyServer/Msgs/Auth/AuthLogout.cs | 6 +- .../LobbyServer/Msgs/Auth/DoEnterServer.cs | 6 +- .../LobbyServer/Msgs/Auth/DoIntlAuth.cs | 6 +- .../LobbyServer/Msgs/Badge/DeleteBadge.cs | 4 +- .../LobbyServer/Msgs/Badge/SyncBadge.cs | 4 +- .../Msgs/Campaign/CampaignPackageGetAll.cs | 4 +- .../Msgs/Campaign/GetCampaignField.cs | 10 +-- .../LobbyServer/Msgs/Campaign/ObtainItem.cs | 8 +- .../LobbyServer/Msgs/Campaign/SaveField.cs | 4 +- .../Msgs/Campaign/SaveFieldObject.cs | 10 +-- .../Character/GetCharacterAttractiveList.cs | 4 +- .../Msgs/Character/GetCharacterCostume.cs | 8 +- .../Msgs/Character/GetCharacterData.cs | 4 +- .../Msgs/Character/GetSynchrodevice.cs | 4 +- .../LobbyServer/Msgs/Character/LevelUp.cs | 10 +-- .../LobbyServer/Msgs/Character/ResetLevel.cs | 10 +-- .../Msgs/Character/SetCharacterCostume.cs | 6 +- .../Msgs/Event/CompleteEventScenario.cs | 6 +- .../LobbyServer/Msgs/Event/EnterEventField.cs | 4 +- .../Msgs/Event/GetClearedMission.cs | 4 +- .../Msgs/Event/GetEventScenario.cs | 6 +- .../LobbyServer/Msgs/Event/GetJoinedEvent.cs | 4 +- .../LobbyServer/Msgs/Event/ListEvents.cs | 4 +- .../Msgs/Event/StoryEvent/GetStoryDungeon.cs | 4 +- .../FavoriteItem/GetFavoriteItemLibrary.cs | 4 +- .../Msgs/FavoriteItem/ListFavoriteItem.cs | 4 +- .../FavoriteItem/ListFavoriteItemQuests.cs | 4 +- .../LobbyServer/Msgs/Friend/GetFriends.cs | 4 +- .../Msgs/Gacha/CheckGachaDailyEvent.cs | 4 +- .../LobbyServer/Msgs/Gacha/ExecGacha.cs | 10 +-- .../LobbyServer/Msgs/GetCurrentTime.cs | 4 +- .../LobbyServer/Msgs/GetGacha.cs | 4 +- .../Msgs/Intercept/GetInterceptData.cs | 6 +- .../Msgs/Intercept/InterceptCheck.cs | 52 +++++------ .../Msgs/Intercept/InterceptClear.cs | 58 ++++++------- .../Msgs/Intercept/InterceptEnter.cs | 46 +++++----- .../Msgs/Intercept/InterceptFastClear.cs | 50 +++++------ .../Msgs/Inventory/ClearAllEquipment.cs | 6 +- .../Msgs/Inventory/ClearEquipment.cs | 6 +- .../Msgs/Inventory/GetInventoryData.cs | 4 +- .../Msgs/Inventory/WearEquipment.cs | 6 +- .../Msgs/Inventory/WearEquipmentList.cs | 6 +- .../Msgs/Liberate/ChooseCharacter.cs | 6 +- .../Msgs/Liberate/GetLiberateData.cs | 4 +- .../Msgs/Liberate/GetProgressList.cs | 6 +- .../Msgs/Lostsector/GetLostSectorData.cs | 4 +- .../Msgs/Messenger/GetDailyMessage.cs | 4 +- .../LobbyServer/Msgs/Messenger/GetMessages.cs | 4 +- .../Msgs/Messenger/GetPickedMessage.cs | 4 +- .../Msgs/Messenger/GetRandomPick.cs | 4 +- .../LobbyServer/Msgs/Messenger/ProceedMsg.cs | 4 +- .../Msgs/Minigame/Dave/GetAllDaveTrigger.cs | 4 +- .../Msgs/Minigame/GetNksv2Minigame.cs | 4 +- .../GetFishingStepUpRewardStatus.cs | 4 +- .../GetPhotoStepUpRewardStatus.cs | 4 +- .../Minigame/IslandAdventure/ListMission.cs | 4 +- .../Minigame/PlaySoda/GetChallengeInfo.cs | 4 +- .../LobbyServer/Msgs/Misc/EnterLobbyPing.cs | 4 +- .../Msgs/Misc/GachaGetAllShutdownFlags.cs | 4 +- .../LobbyServer/Msgs/Misc/GetFeatureFlags.cs | 4 +- .../Msgs/Misc/GetMaintenanceNotice.cs | 6 +- .../Msgs/Misc/GetResourceHosts2.cs | 6 +- .../LobbyServer/Msgs/Misc/GetSentryParams.cs | 6 +- .../LobbyServer/Msgs/Misc/GetServerInfo.cs | 6 +- .../Msgs/Misc/GetStaticDataPack.cs | 12 +-- .../Msgs/Misc/GetUserOnlineStateLog.cs | 4 +- .../Mission/GetAchievementRewardedData.cs | 4 +- .../Msgs/Mission/Rewards/GetDailyRewards.cs | 4 +- .../Msgs/Mission/Rewards/GetJukeboxRewards.cs | 4 +- .../Msgs/Mission/Rewards/GetWeeklyRewards.cs | 4 +- .../Msgs/Outpost/CheckInfracore.cs | 4 +- .../Msgs/Outpost/ClearTacticAcademyLesson.cs | 10 +-- .../LobbyServer/Msgs/Outpost/DoWipeout.cs | 6 +- .../Msgs/Outpost/GetDispatchList.cs | 4 +- .../Msgs/Outpost/GetOutpostData.cs | 4 +- .../Msgs/Outpost/GetRecycleRoomData.cs | 4 +- .../Msgs/Outpost/GetTacticAcademyData.cs | 6 +- .../Msgs/Outpost/MemorialGetMemoryList.cs | 4 +- .../Msgs/Outpost/ShowBattleReward.cs | 4 +- .../PartyMatch/ListPartyMatchInvitations.cs | 4 +- .../Msgs/Pass/GetActiveEventPassData.cs | 4 +- .../Msgs/Pass/GetActivePassData.cs | 4 +- .../Msgs/Ranking/UpdateServerReward.cs | 4 +- .../LobbyServer/Msgs/Shop/GetProductList.cs | 4 +- .../LobbyServer/Msgs/Shop/GetShop.cs | 6 +- .../Msgs/Shop/GetShopProductList.cs | 4 +- .../Msgs/Shop/InApp/GetInAppSubscription.cs | 4 +- .../Msgs/Shop/InApp/GetMarketingDetail.cs | 4 +- .../InApp/GetMonthlySubscriptionReward.cs | 4 +- .../Msgs/Shop/InApp/GetProductListInApp.cs | 4 +- .../Shop/InApp/GetRetrivableProductList.cs | 4 +- .../InApp/GetSetupDataForCustomPackage.cs | 4 +- .../Shop/PackageShop/GetPackagePopupState.cs | 4 +- .../PackageShopGetCampaignPackage.cs | 4 +- .../LobbyServer/Msgs/Sidestory/ClearBattle.cs | 6 +- .../Msgs/Sidestory/ClearSideStoryCut.cs | 6 +- .../Msgs/Sidestory/ClearSideStoryStage.cs | 16 ++-- .../LobbyServer/Msgs/Sidestory/EnterBattle.cs | 6 +- .../Msgs/Sidestory/EnterSidestoryStage.cs | 6 +- .../Msgs/Sidestory/ListSideStory.cs | 6 +- .../Msgs/Simroom/GetSimRoomData.cs | 4 +- .../Msgs/Soloraid/GetSoloraidPeriod.cs | 4 +- .../LobbyServer/Msgs/Stage/CheckCleared.cs | 4 +- .../LobbyServer/Msgs/Stage/ClearStage.cs | 20 ++--- .../LobbyServer/Msgs/Stage/EnterStage.cs | 4 +- .../LobbyServer/Msgs/Stage/GetStage.cs | 6 +- .../Msgs/Subquest/ListSubquests.cs | 4 +- .../Msgs/System/CheckClientVersion.cs | 6 +- .../LobbyServer/Msgs/Team/GetTeamData.cs | 4 +- .../Msgs/Team/ListSupportCharacterCount.cs | 4 +- .../LobbyServer/Msgs/Team/SetTeam.cs | 6 +- .../LobbyServer/Msgs/Tower/GetTowerData.cs | 4 +- .../Msgs/Trigger/FinishMainQuest.cs | 10 +-- .../Msgs/Trigger/GetMainQuestData.cs | 4 +- .../Msgs/Trigger/ObtainMainQuestReward.cs | 14 +-- .../LobbyServer/Msgs/Trigger/TriggerSync.cs | 4 +- .../LobbyServer/Msgs/User/EnterLobbyServer.cs | 6 +- .../Msgs/User/GetAllFeatureFlags.cs | 4 +- .../LobbyServer/Msgs/User/GetContentsData.cs | 4 +- .../LobbyServer/Msgs/User/GetFieldTalkList.cs | 4 +- .../LobbyServer/Msgs/User/GetMail.cs | 4 +- .../Msgs/User/GetProfileCardPossession.cs | 4 +- .../Msgs/User/GetProfileDecoration.cs | 4 +- .../LobbyServer/Msgs/User/GetProfileFrame.cs | 4 +- .../LobbyServer/Msgs/User/GetScenarioList.cs | 4 +- .../Msgs/User/GetSpecialLobbySlotData.cs | 4 +- .../LobbyServer/Msgs/User/GetUser.cs | 4 +- .../LobbyServer/Msgs/User/GetUserProfile.cs | 4 +- .../Msgs/User/GetUserScenarioExist.cs | 4 +- .../LobbyServer/Msgs/User/GetUserTitle.cs | 4 +- .../Msgs/User/GetUserTitleCounter.cs | 4 +- .../LobbyServer/Msgs/User/GetWallpaper.cs | 4 +- .../Msgs/User/GetWallpaperInventory.cs | 4 +- .../LobbyServer/Msgs/User/ReadMail.cs | 4 +- .../LobbyServer/Msgs/User/SetNickname.cs | 4 +- .../LobbyServer/Msgs/User/SetProfileData.cs | 6 +- .../LobbyServer/Msgs/User/SetProfileIcon.cs | 6 +- .../LobbyServer/Msgs/User/SetProfileTeam.cs | 6 +- .../Msgs/User/SetScenarioCompleted.cs | 6 +- .../LobbyServer/Msgs/User/SetWallpaper.cs | 4 +- .../Msgs/User/Tutorial/SetTutorial.cs | 10 +-- .../LobbyServer/Msgs/Wallet/GetWallet.cs | 4 +- .../Msgs/Wallet/WalletRefreshCharge.cs | 4 +- {nksrv => EpinelPS}/Program.cs | 23 ++--- {nksrv => EpinelPS}/Protos/allmsgs.proto | 2 +- {nksrv => EpinelPS}/Protos/intercept.proto | 2 +- {nksrv => EpinelPS}/Protos/liberate.proto | 2 +- {nksrv => EpinelPS}/Protos/outpost.proto | 2 +- {nksrv => EpinelPS}/Protos/shop.proto | 2 +- {nksrv => EpinelPS}/Protos/sidestory.proto | 2 +- {nksrv => EpinelPS}/Protos/system.proto | 2 +- .../Utils/AssetDownloadUtil.cs | 2 +- {nksrv => EpinelPS}/Utils/GameConfig.cs | 2 +- {nksrv => EpinelPS}/Utils/GreatLogger.cs | 2 +- .../Utils/LoggingHttpHandler.cs | 2 +- {nksrv => EpinelPS}/Utils/NetUtils.cs | 8 +- {nksrv => EpinelPS}/Utils/PacketDecryption.cs | 4 +- .../Utils/PacketPathAttribute.cs | 2 +- {nksrv => EpinelPS}/Utils/ProgressBar.cs | 2 +- {nksrv => EpinelPS}/Utils/Rng.cs | 2 +- {nksrv => EpinelPS}/gameconfig.json | 0 {nksrv => EpinelPS}/gameversion.json | 0 .../www/admin/assets/login.css | 0 .../www/admin/assets/login.jpg | Bin .../www/admin/assets/style.css | 0 {nksrv => EpinelPS}/www/admin/dashbrd.html | 0 {nksrv => EpinelPS}/www/admin/index.html | 0 {nksrv => EpinelPS}/www/admin/nav.html | 0 {nksrv => EpinelPS}/www/launcher/index.html | 0 README.md | 30 +------ nksrv/site.pfx | Bin 2723 -> 0 bytes 204 files changed, 587 insertions(+), 700 deletions(-) rename nksrv.sln => EpinelPS.sln (53%) rename {nksrv => EpinelPS}/AdminApiController.cs (98%) rename {nksrv => EpinelPS}/Database/JsonDb.cs (99%) rename nksrv/nksrv.csproj => EpinelPS/EpinelPS.csproj (100%) rename nksrv/StaticInfo/StaticDataParser.cs => EpinelPS/GameData/GameData.cs (88%) rename {nksrv/StaticInfo => EpinelPS/GameData}/JsonStaticData.cs (99%) rename {nksrv => EpinelPS}/IntlServer/AutoLoginEndpoint.cs (98%) rename {nksrv => EpinelPS}/IntlServer/CodeStatusEndpoint.cs (91%) rename {nksrv => EpinelPS}/IntlServer/GetNoticeContent.cs (98%) rename {nksrv => EpinelPS}/IntlServer/IntlAccountRedirect.cs (97%) rename {nksrv => EpinelPS}/IntlServer/IntlAccountRegisterEndpoint.cs (95%) rename {nksrv => EpinelPS}/IntlServer/IntlGetAccountInfo.cs (96%) rename {nksrv => EpinelPS}/IntlServer/IntlGetProfileBindInfo.cs (97%) rename {nksrv => EpinelPS}/IntlServer/IntlGetProfileInfo.cs (97%) rename {nksrv => EpinelPS}/IntlServer/IntlHandler.cs (98%) rename {nksrv => EpinelPS}/IntlServer/IntlLogin1Endpoint.cs (94%) rename {nksrv => EpinelPS}/IntlServer/IntlLogin2Endpoint.cs (98%) rename {nksrv => EpinelPS}/IntlServer/IntlMsgHandler.cs (98%) rename {nksrv => EpinelPS}/IntlServer/IntlQueryAccountInfo.cs (96%) rename {nksrv => EpinelPS}/IntlServer/IntlReturnJsonHandler.cs (92%) rename {nksrv => EpinelPS}/IntlServer/JuniperLauncherGetRegion.cs (97%) rename {nksrv => EpinelPS}/IntlServer/JuniperLauncherGetRepoVersion.cs (93%) rename {nksrv => EpinelPS}/IntlServer/JupiterAuthLogin.cs (95%) rename {nksrv => EpinelPS}/IntlServer/JupterGetGameLauncher.cs (96%) rename {nksrv => EpinelPS}/IntlServer/SendCodeEndpoint.cs (93%) rename {nksrv => EpinelPS}/LobbyServer/LobbyHandler.cs (98%) rename {nksrv => EpinelPS}/LobbyServer/LobbyMsgHandler.cs (97%) rename {nksrv => EpinelPS}/LobbyServer/Msgs/Antibot/BattleReportData.cs (85%) rename {nksrv => EpinelPS}/LobbyServer/Msgs/Antibot/RecieveAntibotData.cs (86%) rename {nksrv => EpinelPS}/LobbyServer/Msgs/Archive/CheckBookmarkScenarioExists.cs (84%) rename {nksrv => EpinelPS}/LobbyServer/Msgs/Archive/GetArchives.cs (90%) rename {nksrv => EpinelPS}/LobbyServer/Msgs/Arena/GetArenaBanInfo.cs (84%) rename {nksrv => EpinelPS}/LobbyServer/Msgs/Arena/ShowSpecialArenaReward.cs (85%) rename {nksrv => EpinelPS}/LobbyServer/Msgs/Auth/AuthLogout.cs (78%) rename {nksrv => EpinelPS}/LobbyServer/Msgs/Auth/DoEnterServer.cs (93%) rename {nksrv => EpinelPS}/LobbyServer/Msgs/Auth/DoIntlAuth.cs (95%) rename {nksrv => EpinelPS}/LobbyServer/Msgs/Badge/DeleteBadge.cs (82%) rename {nksrv => EpinelPS}/LobbyServer/Msgs/Badge/SyncBadge.cs (82%) rename {nksrv => EpinelPS}/LobbyServer/Msgs/Campaign/CampaignPackageGetAll.cs (85%) rename {nksrv => EpinelPS}/LobbyServer/Msgs/Campaign/GetCampaignField.cs (84%) rename {nksrv => EpinelPS}/LobbyServer/Msgs/Campaign/ObtainItem.cs (75%) rename {nksrv => EpinelPS}/LobbyServer/Msgs/Campaign/SaveField.cs (90%) rename {nksrv => EpinelPS}/LobbyServer/Msgs/Campaign/SaveFieldObject.cs (80%) rename {nksrv => EpinelPS}/LobbyServer/Msgs/Character/GetCharacterAttractiveList.cs (87%) rename {nksrv => EpinelPS}/LobbyServer/Msgs/Character/GetCharacterCostume.cs (68%) rename {nksrv => EpinelPS}/LobbyServer/Msgs/Character/GetCharacterData.cs (94%) rename {nksrv => EpinelPS}/LobbyServer/Msgs/Character/GetSynchrodevice.cs (96%) rename {nksrv => EpinelPS}/LobbyServer/Msgs/Character/LevelUp.cs (94%) rename {nksrv => EpinelPS}/LobbyServer/Msgs/Character/ResetLevel.cs (93%) rename {nksrv => EpinelPS}/LobbyServer/Msgs/Character/SetCharacterCostume.cs (87%) rename {nksrv => EpinelPS}/LobbyServer/Msgs/Event/CompleteEventScenario.cs (90%) rename {nksrv => EpinelPS}/LobbyServer/Msgs/Event/EnterEventField.cs (84%) rename {nksrv => EpinelPS}/LobbyServer/Msgs/Event/GetClearedMission.cs (84%) rename {nksrv => EpinelPS}/LobbyServer/Msgs/Event/GetEventScenario.cs (88%) rename {nksrv => EpinelPS}/LobbyServer/Msgs/Event/GetJoinedEvent.cs (97%) rename {nksrv => EpinelPS}/LobbyServer/Msgs/Event/ListEvents.cs (98%) rename {nksrv => EpinelPS}/LobbyServer/Msgs/Event/StoryEvent/GetStoryDungeon.cs (89%) rename {nksrv => EpinelPS}/LobbyServer/Msgs/FavoriteItem/GetFavoriteItemLibrary.cs (84%) rename {nksrv => EpinelPS}/LobbyServer/Msgs/FavoriteItem/ListFavoriteItem.cs (83%) rename {nksrv => EpinelPS}/LobbyServer/Msgs/FavoriteItem/ListFavoriteItemQuests.cs (84%) rename {nksrv => EpinelPS}/LobbyServer/Msgs/Friend/GetFriends.cs (82%) rename {nksrv => EpinelPS}/LobbyServer/Msgs/Gacha/CheckGachaDailyEvent.cs (87%) rename {nksrv => EpinelPS}/LobbyServer/Msgs/Gacha/ExecGacha.cs (88%) rename {nksrv => EpinelPS}/LobbyServer/Msgs/GetCurrentTime.cs (91%) rename {nksrv => EpinelPS}/LobbyServer/Msgs/GetGacha.cs (88%) rename {nksrv => EpinelPS}/LobbyServer/Msgs/Intercept/GetInterceptData.cs (87%) rename {nksrv => EpinelPS}/LobbyServer/Msgs/Intercept/InterceptCheck.cs (83%) rename {nksrv => EpinelPS}/LobbyServer/Msgs/Intercept/InterceptClear.cs (85%) rename {nksrv => EpinelPS}/LobbyServer/Msgs/Intercept/InterceptEnter.cs (81%) rename {nksrv => EpinelPS}/LobbyServer/Msgs/Intercept/InterceptFastClear.cs (83%) rename {nksrv => EpinelPS}/LobbyServer/Msgs/Inventory/ClearAllEquipment.cs (88%) rename {nksrv => EpinelPS}/LobbyServer/Msgs/Inventory/ClearEquipment.cs (88%) rename {nksrv => EpinelPS}/LobbyServer/Msgs/Inventory/GetInventoryData.cs (91%) rename {nksrv => EpinelPS}/LobbyServer/Msgs/Inventory/WearEquipment.cs (91%) rename {nksrv => EpinelPS}/LobbyServer/Msgs/Inventory/WearEquipmentList.cs (92%) rename {nksrv => EpinelPS}/LobbyServer/Msgs/Liberate/ChooseCharacter.cs (91%) rename {nksrv => EpinelPS}/LobbyServer/Msgs/Liberate/GetLiberateData.cs (84%) rename {nksrv => EpinelPS}/LobbyServer/Msgs/Liberate/GetProgressList.cs (85%) rename {nksrv => EpinelPS}/LobbyServer/Msgs/Lostsector/GetLostSectorData.cs (84%) rename {nksrv => EpinelPS}/LobbyServer/Msgs/Messenger/GetDailyMessage.cs (84%) rename {nksrv => EpinelPS}/LobbyServer/Msgs/Messenger/GetMessages.cs (83%) rename {nksrv => EpinelPS}/LobbyServer/Msgs/Messenger/GetPickedMessage.cs (84%) rename {nksrv => EpinelPS}/LobbyServer/Msgs/Messenger/GetRandomPick.cs (85%) rename {nksrv => EpinelPS}/LobbyServer/Msgs/Messenger/ProceedMsg.cs (83%) rename {nksrv => EpinelPS}/LobbyServer/Msgs/Minigame/Dave/GetAllDaveTrigger.cs (84%) rename {nksrv => EpinelPS}/LobbyServer/Msgs/Minigame/GetNksv2Minigame.cs (84%) rename {nksrv => EpinelPS}/LobbyServer/Msgs/Minigame/IslandAdventure/GetFishingStepUpRewardStatus.cs (84%) rename {nksrv => EpinelPS}/LobbyServer/Msgs/Minigame/IslandAdventure/GetPhotoStepUpRewardStatus.cs (84%) rename {nksrv => EpinelPS}/LobbyServer/Msgs/Minigame/IslandAdventure/ListMission.cs (82%) rename {nksrv => EpinelPS}/LobbyServer/Msgs/Minigame/PlaySoda/GetChallengeInfo.cs (83%) rename {nksrv => EpinelPS}/LobbyServer/Msgs/Misc/EnterLobbyPing.cs (83%) rename {nksrv => EpinelPS}/LobbyServer/Msgs/Misc/GachaGetAllShutdownFlags.cs (89%) rename {nksrv => EpinelPS}/LobbyServer/Msgs/Misc/GetFeatureFlags.cs (84%) rename {nksrv => EpinelPS}/LobbyServer/Msgs/Misc/GetMaintenanceNotice.cs (76%) rename {nksrv => EpinelPS}/LobbyServer/Msgs/Misc/GetResourceHosts2.cs (81%) rename {nksrv => EpinelPS}/LobbyServer/Msgs/Misc/GetSentryParams.cs (81%) rename {nksrv => EpinelPS}/LobbyServer/Msgs/Misc/GetServerInfo.cs (82%) rename {nksrv => EpinelPS}/LobbyServer/Msgs/Misc/GetStaticDataPack.cs (73%) rename {nksrv => EpinelPS}/LobbyServer/Msgs/Misc/GetUserOnlineStateLog.cs (86%) rename {nksrv => EpinelPS}/LobbyServer/Msgs/Mission/GetAchievementRewardedData.cs (85%) rename {nksrv => EpinelPS}/LobbyServer/Msgs/Mission/Rewards/GetDailyRewards.cs (83%) rename {nksrv => EpinelPS}/LobbyServer/Msgs/Mission/Rewards/GetJukeboxRewards.cs (85%) rename {nksrv => EpinelPS}/LobbyServer/Msgs/Mission/Rewards/GetWeeklyRewards.cs (83%) rename {nksrv => EpinelPS}/LobbyServer/Msgs/Outpost/CheckInfracore.cs (84%) rename {nksrv => EpinelPS}/LobbyServer/Msgs/Outpost/ClearTacticAcademyLesson.cs (85%) rename {nksrv => EpinelPS}/LobbyServer/Msgs/Outpost/DoWipeout.cs (80%) rename {nksrv => EpinelPS}/LobbyServer/Msgs/Outpost/GetDispatchList.cs (83%) rename {nksrv => EpinelPS}/LobbyServer/Msgs/Outpost/GetOutpostData.cs (97%) rename {nksrv => EpinelPS}/LobbyServer/Msgs/Outpost/GetRecycleRoomData.cs (85%) rename {nksrv => EpinelPS}/LobbyServer/Msgs/Outpost/GetTacticAcademyData.cs (84%) rename {nksrv => EpinelPS}/LobbyServer/Msgs/Outpost/MemorialGetMemoryList.cs (84%) rename {nksrv => EpinelPS}/LobbyServer/Msgs/Outpost/ShowBattleReward.cs (93%) rename {nksrv => EpinelPS}/LobbyServer/Msgs/PartyMatch/ListPartyMatchInvitations.cs (84%) rename {nksrv => EpinelPS}/LobbyServer/Msgs/Pass/GetActiveEventPassData.cs (85%) rename {nksrv => EpinelPS}/LobbyServer/Msgs/Pass/GetActivePassData.cs (85%) rename {nksrv => EpinelPS}/LobbyServer/Msgs/Ranking/UpdateServerReward.cs (84%) rename {nksrv => EpinelPS}/LobbyServer/Msgs/Shop/GetProductList.cs (93%) rename {nksrv => EpinelPS}/LobbyServer/Msgs/Shop/GetShop.cs (83%) rename {nksrv => EpinelPS}/LobbyServer/Msgs/Shop/GetShopProductList.cs (83%) rename {nksrv => EpinelPS}/LobbyServer/Msgs/Shop/InApp/GetInAppSubscription.cs (83%) rename {nksrv => EpinelPS}/LobbyServer/Msgs/Shop/InApp/GetMarketingDetail.cs (85%) rename {nksrv => EpinelPS}/LobbyServer/Msgs/Shop/InApp/GetMonthlySubscriptionReward.cs (86%) rename {nksrv => EpinelPS}/LobbyServer/Msgs/Shop/InApp/GetProductListInApp.cs (83%) rename {nksrv => EpinelPS}/LobbyServer/Msgs/Shop/InApp/GetRetrivableProductList.cs (85%) rename {nksrv => EpinelPS}/LobbyServer/Msgs/Shop/InApp/GetSetupDataForCustomPackage.cs (86%) rename {nksrv => EpinelPS}/LobbyServer/Msgs/Shop/PackageShop/GetPackagePopupState.cs (82%) rename {nksrv => EpinelPS}/LobbyServer/Msgs/Shop/PackageShop/PackageShopGetCampaignPackage.cs (85%) rename {nksrv => EpinelPS}/LobbyServer/Msgs/Sidestory/ClearBattle.cs (82%) rename {nksrv => EpinelPS}/LobbyServer/Msgs/Sidestory/ClearSideStoryCut.cs (85%) rename {nksrv => EpinelPS}/LobbyServer/Msgs/Sidestory/ClearSideStoryStage.cs (70%) rename {nksrv => EpinelPS}/LobbyServer/Msgs/Sidestory/EnterBattle.cs (81%) rename {nksrv => EpinelPS}/LobbyServer/Msgs/Sidestory/EnterSidestoryStage.cs (85%) rename {nksrv => EpinelPS}/LobbyServer/Msgs/Sidestory/ListSideStory.cs (88%) rename {nksrv => EpinelPS}/LobbyServer/Msgs/Simroom/GetSimRoomData.cs (93%) rename {nksrv => EpinelPS}/LobbyServer/Msgs/Soloraid/GetSoloraidPeriod.cs (86%) rename {nksrv => EpinelPS}/LobbyServer/Msgs/Stage/CheckCleared.cs (91%) rename {nksrv => EpinelPS}/LobbyServer/Msgs/Stage/ClearStage.cs (93%) rename {nksrv => EpinelPS}/LobbyServer/Msgs/Stage/EnterStage.cs (82%) rename {nksrv => EpinelPS}/LobbyServer/Msgs/Stage/GetStage.cs (94%) rename {nksrv => EpinelPS}/LobbyServer/Msgs/Subquest/ListSubquests.cs (83%) rename {nksrv => EpinelPS}/LobbyServer/Msgs/System/CheckClientVersion.cs (86%) rename {nksrv => EpinelPS}/LobbyServer/Msgs/Team/GetTeamData.cs (90%) rename {nksrv => EpinelPS}/LobbyServer/Msgs/Team/ListSupportCharacterCount.cs (90%) rename {nksrv => EpinelPS}/LobbyServer/Msgs/Team/SetTeam.cs (91%) rename {nksrv => EpinelPS}/LobbyServer/Msgs/Tower/GetTowerData.cs (95%) rename {nksrv => EpinelPS}/LobbyServer/Msgs/Trigger/FinishMainQuest.cs (73%) rename {nksrv => EpinelPS}/LobbyServer/Msgs/Trigger/GetMainQuestData.cs (89%) rename {nksrv => EpinelPS}/LobbyServer/Msgs/Trigger/ObtainMainQuestReward.cs (77%) rename {nksrv => EpinelPS}/LobbyServer/Msgs/Trigger/TriggerSync.cs (81%) rename {nksrv => EpinelPS}/LobbyServer/Msgs/User/EnterLobbyServer.cs (98%) rename {nksrv => EpinelPS}/LobbyServer/Msgs/User/GetAllFeatureFlags.cs (98%) rename {nksrv => EpinelPS}/LobbyServer/Msgs/User/GetContentsData.cs (94%) rename {nksrv => EpinelPS}/LobbyServer/Msgs/User/GetFieldTalkList.cs (85%) rename {nksrv => EpinelPS}/LobbyServer/Msgs/User/GetMail.cs (93%) rename {nksrv => EpinelPS}/LobbyServer/Msgs/User/GetProfileCardPossession.cs (85%) rename {nksrv => EpinelPS}/LobbyServer/Msgs/User/GetProfileDecoration.cs (87%) rename {nksrv => EpinelPS}/LobbyServer/Msgs/User/GetProfileFrame.cs (84%) rename {nksrv => EpinelPS}/LobbyServer/Msgs/User/GetScenarioList.cs (90%) rename {nksrv => EpinelPS}/LobbyServer/Msgs/User/GetSpecialLobbySlotData.cs (88%) rename {nksrv => EpinelPS}/LobbyServer/Msgs/User/GetUser.cs (96%) rename {nksrv => EpinelPS}/LobbyServer/Msgs/User/GetUserProfile.cs (96%) rename {nksrv => EpinelPS}/LobbyServer/Msgs/User/GetUserScenarioExist.cs (93%) rename {nksrv => EpinelPS}/LobbyServer/Msgs/User/GetUserTitle.cs (85%) rename {nksrv => EpinelPS}/LobbyServer/Msgs/User/GetUserTitleCounter.cs (84%) rename {nksrv => EpinelPS}/LobbyServer/Msgs/User/GetWallpaper.cs (85%) rename {nksrv => EpinelPS}/LobbyServer/Msgs/User/GetWallpaperInventory.cs (84%) rename {nksrv => EpinelPS}/LobbyServer/Msgs/User/ReadMail.cs (82%) rename {nksrv => EpinelPS}/LobbyServer/Msgs/User/SetNickname.cs (88%) rename {nksrv => EpinelPS}/LobbyServer/Msgs/User/SetProfileData.cs (87%) rename {nksrv => EpinelPS}/LobbyServer/Msgs/User/SetProfileIcon.cs (84%) rename {nksrv => EpinelPS}/LobbyServer/Msgs/User/SetProfileTeam.cs (92%) rename {nksrv => EpinelPS}/LobbyServer/Msgs/User/SetScenarioCompleted.cs (90%) rename {nksrv => EpinelPS}/LobbyServer/Msgs/User/SetWallpaper.cs (86%) rename {nksrv => EpinelPS}/LobbyServer/Msgs/User/Tutorial/SetTutorial.cs (73%) rename {nksrv => EpinelPS}/LobbyServer/Msgs/Wallet/GetWallet.cs (91%) rename {nksrv => EpinelPS}/LobbyServer/Msgs/Wallet/WalletRefreshCharge.cs (93%) rename {nksrv => EpinelPS}/Program.cs (97%) rename {nksrv => EpinelPS}/Protos/allmsgs.proto (99%) rename {nksrv => EpinelPS}/Protos/intercept.proto (97%) rename {nksrv => EpinelPS}/Protos/liberate.proto (94%) rename {nksrv => EpinelPS}/Protos/outpost.proto (94%) rename {nksrv => EpinelPS}/Protos/shop.proto (93%) rename {nksrv => EpinelPS}/Protos/sidestory.proto (97%) rename {nksrv => EpinelPS}/Protos/system.proto (96%) rename {nksrv => EpinelPS}/Utils/AssetDownloadUtil.cs (99%) rename {nksrv => EpinelPS}/Utils/GameConfig.cs (98%) rename {nksrv => EpinelPS}/Utils/GreatLogger.cs (98%) rename {nksrv => EpinelPS}/Utils/LoggingHttpHandler.cs (97%) rename {nksrv => EpinelPS}/Utils/NetUtils.cs (96%) rename {nksrv => EpinelPS}/Utils/PacketDecryption.cs (99%) rename {nksrv => EpinelPS}/Utils/PacketPathAttribute.cs (92%) rename {nksrv => EpinelPS}/Utils/ProgressBar.cs (99%) rename {nksrv => EpinelPS}/Utils/Rng.cs (94%) rename {nksrv => EpinelPS}/gameconfig.json (100%) rename {nksrv => EpinelPS}/gameversion.json (100%) rename {nksrv => EpinelPS}/www/admin/assets/login.css (100%) rename {nksrv => EpinelPS}/www/admin/assets/login.jpg (100%) rename {nksrv => EpinelPS}/www/admin/assets/style.css (100%) rename {nksrv => EpinelPS}/www/admin/dashbrd.html (100%) rename {nksrv => EpinelPS}/www/admin/index.html (100%) rename {nksrv => EpinelPS}/www/admin/nav.html (100%) rename {nksrv => EpinelPS}/www/launcher/index.html (100%) delete mode 100644 nksrv/site.pfx diff --git a/nksrv.sln b/EpinelPS.sln similarity index 53% rename from nksrv.sln rename to EpinelPS.sln index 071636a..876297b 100644 --- a/nksrv.sln +++ b/EpinelPS.sln @@ -3,11 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Version 17 VisualStudioVersion = 17.10.34928.147 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "nksrv", "nksrv\nksrv.csproj", "{5C24A07E-9B8D-4625-BF91-0E9CCBEF5CB0}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DataFixupUtil", "DataFixupUtil\DataFixupUtil.csproj", "{13124DFB-448B-4F4F-A479-537EE067D836}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ProtobufViewUtil", "ProtobufViewUtil\ProtobufViewUtil.csproj", "{FDEDD0D6-9C02-4E58-8110-04E8D5639881}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EpinelPS", "EpinelPS\EpinelPS.csproj", "{5C24A07E-9B8D-4625-BF91-0E9CCBEF5CB0}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ServerSelector", "ServerSelector\ServerSelector.csproj", "{EC613C24-8A35-42E8-92C1-9A8431F74F58}" EndProject @@ -15,8 +11,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ServerSelector.Desktop", "S EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Client", "Client", "{4BB2E77F-84A6-4644-9FB3-38E2A7DCDEC0}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GameDownloader", "GameDownloader\GameDownloader.csproj", "{E3512D9F-CB94-4C80-B673-0EB83CA21D12}" -EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -57,54 +51,6 @@ Global {5C24A07E-9B8D-4625-BF91-0E9CCBEF5CB0}.ReleaseDLL|x64.Build.0 = Release|Any CPU {5C24A07E-9B8D-4625-BF91-0E9CCBEF5CB0}.ReleaseDLL|x86.ActiveCfg = Release|Any CPU {5C24A07E-9B8D-4625-BF91-0E9CCBEF5CB0}.ReleaseDLL|x86.Build.0 = Release|Any CPU - {13124DFB-448B-4F4F-A479-537EE067D836}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {13124DFB-448B-4F4F-A479-537EE067D836}.Debug|Any CPU.Build.0 = Debug|Any CPU - {13124DFB-448B-4F4F-A479-537EE067D836}.Debug|x64.ActiveCfg = Debug|Any CPU - {13124DFB-448B-4F4F-A479-537EE067D836}.Debug|x64.Build.0 = Debug|Any CPU - {13124DFB-448B-4F4F-A479-537EE067D836}.Debug|x86.ActiveCfg = Debug|Any CPU - {13124DFB-448B-4F4F-A479-537EE067D836}.Debug|x86.Build.0 = Debug|Any CPU - {13124DFB-448B-4F4F-A479-537EE067D836}.DebugDLL|Any CPU.ActiveCfg = Debug|Any CPU - {13124DFB-448B-4F4F-A479-537EE067D836}.DebugDLL|Any CPU.Build.0 = Debug|Any CPU - {13124DFB-448B-4F4F-A479-537EE067D836}.DebugDLL|x64.ActiveCfg = Debug|Any CPU - {13124DFB-448B-4F4F-A479-537EE067D836}.DebugDLL|x64.Build.0 = Debug|Any CPU - {13124DFB-448B-4F4F-A479-537EE067D836}.DebugDLL|x86.ActiveCfg = Debug|Any CPU - {13124DFB-448B-4F4F-A479-537EE067D836}.DebugDLL|x86.Build.0 = Debug|Any CPU - {13124DFB-448B-4F4F-A479-537EE067D836}.Release|Any CPU.ActiveCfg = Release|Any CPU - {13124DFB-448B-4F4F-A479-537EE067D836}.Release|Any CPU.Build.0 = Release|Any CPU - {13124DFB-448B-4F4F-A479-537EE067D836}.Release|x64.ActiveCfg = Release|Any CPU - {13124DFB-448B-4F4F-A479-537EE067D836}.Release|x64.Build.0 = Release|Any CPU - {13124DFB-448B-4F4F-A479-537EE067D836}.Release|x86.ActiveCfg = Release|Any CPU - {13124DFB-448B-4F4F-A479-537EE067D836}.Release|x86.Build.0 = Release|Any CPU - {13124DFB-448B-4F4F-A479-537EE067D836}.ReleaseDLL|Any CPU.ActiveCfg = Release|Any CPU - {13124DFB-448B-4F4F-A479-537EE067D836}.ReleaseDLL|Any CPU.Build.0 = Release|Any CPU - {13124DFB-448B-4F4F-A479-537EE067D836}.ReleaseDLL|x64.ActiveCfg = Release|Any CPU - {13124DFB-448B-4F4F-A479-537EE067D836}.ReleaseDLL|x64.Build.0 = Release|Any CPU - {13124DFB-448B-4F4F-A479-537EE067D836}.ReleaseDLL|x86.ActiveCfg = Release|Any CPU - {13124DFB-448B-4F4F-A479-537EE067D836}.ReleaseDLL|x86.Build.0 = Release|Any CPU - {FDEDD0D6-9C02-4E58-8110-04E8D5639881}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FDEDD0D6-9C02-4E58-8110-04E8D5639881}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FDEDD0D6-9C02-4E58-8110-04E8D5639881}.Debug|x64.ActiveCfg = Debug|Any CPU - {FDEDD0D6-9C02-4E58-8110-04E8D5639881}.Debug|x64.Build.0 = Debug|Any CPU - {FDEDD0D6-9C02-4E58-8110-04E8D5639881}.Debug|x86.ActiveCfg = Debug|Any CPU - {FDEDD0D6-9C02-4E58-8110-04E8D5639881}.Debug|x86.Build.0 = Debug|Any CPU - {FDEDD0D6-9C02-4E58-8110-04E8D5639881}.DebugDLL|Any CPU.ActiveCfg = Debug|Any CPU - {FDEDD0D6-9C02-4E58-8110-04E8D5639881}.DebugDLL|Any CPU.Build.0 = Debug|Any CPU - {FDEDD0D6-9C02-4E58-8110-04E8D5639881}.DebugDLL|x64.ActiveCfg = Debug|Any CPU - {FDEDD0D6-9C02-4E58-8110-04E8D5639881}.DebugDLL|x64.Build.0 = Debug|Any CPU - {FDEDD0D6-9C02-4E58-8110-04E8D5639881}.DebugDLL|x86.ActiveCfg = Debug|Any CPU - {FDEDD0D6-9C02-4E58-8110-04E8D5639881}.DebugDLL|x86.Build.0 = Debug|Any CPU - {FDEDD0D6-9C02-4E58-8110-04E8D5639881}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FDEDD0D6-9C02-4E58-8110-04E8D5639881}.Release|Any CPU.Build.0 = Release|Any CPU - {FDEDD0D6-9C02-4E58-8110-04E8D5639881}.Release|x64.ActiveCfg = Release|Any CPU - {FDEDD0D6-9C02-4E58-8110-04E8D5639881}.Release|x64.Build.0 = Release|Any CPU - {FDEDD0D6-9C02-4E58-8110-04E8D5639881}.Release|x86.ActiveCfg = Release|Any CPU - {FDEDD0D6-9C02-4E58-8110-04E8D5639881}.Release|x86.Build.0 = Release|Any CPU - {FDEDD0D6-9C02-4E58-8110-04E8D5639881}.ReleaseDLL|Any CPU.ActiveCfg = Release|Any CPU - {FDEDD0D6-9C02-4E58-8110-04E8D5639881}.ReleaseDLL|Any CPU.Build.0 = Release|Any CPU - {FDEDD0D6-9C02-4E58-8110-04E8D5639881}.ReleaseDLL|x64.ActiveCfg = Release|Any CPU - {FDEDD0D6-9C02-4E58-8110-04E8D5639881}.ReleaseDLL|x64.Build.0 = Release|Any CPU - {FDEDD0D6-9C02-4E58-8110-04E8D5639881}.ReleaseDLL|x86.ActiveCfg = Release|Any CPU - {FDEDD0D6-9C02-4E58-8110-04E8D5639881}.ReleaseDLL|x86.Build.0 = Release|Any CPU {EC613C24-8A35-42E8-92C1-9A8431F74F58}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {EC613C24-8A35-42E8-92C1-9A8431F74F58}.Debug|Any CPU.Build.0 = Debug|Any CPU {EC613C24-8A35-42E8-92C1-9A8431F74F58}.Debug|x64.ActiveCfg = Debug|Any CPU @@ -153,30 +99,6 @@ Global {01D0A73A-A881-439D-9318-54DB5B00D6F5}.ReleaseDLL|x64.Build.0 = Release|Any CPU {01D0A73A-A881-439D-9318-54DB5B00D6F5}.ReleaseDLL|x86.ActiveCfg = Release|Any CPU {01D0A73A-A881-439D-9318-54DB5B00D6F5}.ReleaseDLL|x86.Build.0 = Release|Any CPU - {E3512D9F-CB94-4C80-B673-0EB83CA21D12}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E3512D9F-CB94-4C80-B673-0EB83CA21D12}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E3512D9F-CB94-4C80-B673-0EB83CA21D12}.Debug|x64.ActiveCfg = Debug|Any CPU - {E3512D9F-CB94-4C80-B673-0EB83CA21D12}.Debug|x64.Build.0 = Debug|Any CPU - {E3512D9F-CB94-4C80-B673-0EB83CA21D12}.Debug|x86.ActiveCfg = Debug|Any CPU - {E3512D9F-CB94-4C80-B673-0EB83CA21D12}.Debug|x86.Build.0 = Debug|Any CPU - {E3512D9F-CB94-4C80-B673-0EB83CA21D12}.DebugDLL|Any CPU.ActiveCfg = Debug|Any CPU - {E3512D9F-CB94-4C80-B673-0EB83CA21D12}.DebugDLL|Any CPU.Build.0 = Debug|Any CPU - {E3512D9F-CB94-4C80-B673-0EB83CA21D12}.DebugDLL|x64.ActiveCfg = Debug|Any CPU - {E3512D9F-CB94-4C80-B673-0EB83CA21D12}.DebugDLL|x64.Build.0 = Debug|Any CPU - {E3512D9F-CB94-4C80-B673-0EB83CA21D12}.DebugDLL|x86.ActiveCfg = Debug|Any CPU - {E3512D9F-CB94-4C80-B673-0EB83CA21D12}.DebugDLL|x86.Build.0 = Debug|Any CPU - {E3512D9F-CB94-4C80-B673-0EB83CA21D12}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E3512D9F-CB94-4C80-B673-0EB83CA21D12}.Release|Any CPU.Build.0 = Release|Any CPU - {E3512D9F-CB94-4C80-B673-0EB83CA21D12}.Release|x64.ActiveCfg = Release|Any CPU - {E3512D9F-CB94-4C80-B673-0EB83CA21D12}.Release|x64.Build.0 = Release|Any CPU - {E3512D9F-CB94-4C80-B673-0EB83CA21D12}.Release|x86.ActiveCfg = Release|Any CPU - {E3512D9F-CB94-4C80-B673-0EB83CA21D12}.Release|x86.Build.0 = Release|Any CPU - {E3512D9F-CB94-4C80-B673-0EB83CA21D12}.ReleaseDLL|Any CPU.ActiveCfg = Release|Any CPU - {E3512D9F-CB94-4C80-B673-0EB83CA21D12}.ReleaseDLL|Any CPU.Build.0 = Release|Any CPU - {E3512D9F-CB94-4C80-B673-0EB83CA21D12}.ReleaseDLL|x64.ActiveCfg = Release|Any CPU - {E3512D9F-CB94-4C80-B673-0EB83CA21D12}.ReleaseDLL|x64.Build.0 = Release|Any CPU - {E3512D9F-CB94-4C80-B673-0EB83CA21D12}.ReleaseDLL|x86.ActiveCfg = Release|Any CPU - {E3512D9F-CB94-4C80-B673-0EB83CA21D12}.ReleaseDLL|x86.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -184,7 +106,6 @@ Global GlobalSection(NestedProjects) = preSolution {EC613C24-8A35-42E8-92C1-9A8431F74F58} = {4BB2E77F-84A6-4644-9FB3-38E2A7DCDEC0} {01D0A73A-A881-439D-9318-54DB5B00D6F5} = {4BB2E77F-84A6-4644-9FB3-38E2A7DCDEC0} - {E3512D9F-CB94-4C80-B673-0EB83CA21D12} = {4BB2E77F-84A6-4644-9FB3-38E2A7DCDEC0} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {F779F2DC-B207-4091-83B8-0EA250461DCE} diff --git a/nksrv/AdminApiController.cs b/EpinelPS/AdminApiController.cs similarity index 98% rename from nksrv/AdminApiController.cs rename to EpinelPS/AdminApiController.cs index c0434ca..7e1f284 100644 --- a/nksrv/AdminApiController.cs +++ b/EpinelPS/AdminApiController.cs @@ -1,11 +1,11 @@ using EmbedIO; using EmbedIO.Routing; using EmbedIO.WebApi; -using nksrv.Database; +using EpinelPS.Database; using System.Security.Cryptography; using System.Text; -namespace nksrv +namespace EpinelPS { public class AdminApiController : WebApiController { diff --git a/nksrv/Database/JsonDb.cs b/EpinelPS/Database/JsonDb.cs similarity index 99% rename from nksrv/Database/JsonDb.cs rename to EpinelPS/Database/JsonDb.cs index 4892cca..f70aa08 100644 --- a/nksrv/Database/JsonDb.cs +++ b/EpinelPS/Database/JsonDb.cs @@ -1,10 +1,10 @@ using Newtonsoft.Json; -using nksrv.LobbyServer; -using nksrv.StaticInfo; -using nksrv.Utils; +using EpinelPS.LobbyServer; +using EpinelPS.StaticInfo; +using EpinelPS.Utils; using Swan.Logging; -namespace nksrv.Database +namespace EpinelPS.Database { public class AccessToken { diff --git a/nksrv/nksrv.csproj b/EpinelPS/EpinelPS.csproj similarity index 100% rename from nksrv/nksrv.csproj rename to EpinelPS/EpinelPS.csproj diff --git a/nksrv/StaticInfo/StaticDataParser.cs b/EpinelPS/GameData/GameData.cs similarity index 88% rename from nksrv/StaticInfo/StaticDataParser.cs rename to EpinelPS/GameData/GameData.cs index bb9be7e..c90e369 100644 --- a/nksrv/StaticInfo/StaticDataParser.cs +++ b/EpinelPS/GameData/GameData.cs @@ -1,31 +1,18 @@ using ICSharpCode.SharpZipLib.Zip; using Newtonsoft.Json; using Newtonsoft.Json.Linq; -using nksrv.Utils; +using EpinelPS.Utils; using Swan.Logging; using System.Collections.Generic; using System.Diagnostics; using System.Security.Cryptography; -namespace nksrv.StaticInfo +namespace EpinelPS.StaticInfo { - /// - /// "Static data" which is what the game calls it, contains data such as map info, characters, quests, rewards and a lot more. - /// - public class StaticDataParser + public class GameData { - // These fields were extracted from the game. - public static byte[] PresharedKey = [0xCB, 0xC2, 0x1C, 0x6F, 0xF3, 0xF5, 0x07, 0xF5, 0x05, 0xBA, 0xCA, 0xD4, 0x98, 0x28, 0x84, 0x1F, 0xF0, 0xD1, 0x38, 0xC7, 0x61, 0xDF, 0xD6, 0xE6, 0x64, 0x9A, 0x85, 0x13, 0x3E, 0x1A, 0x6A, 0x0C, 0x68, 0x0E, 0x2B, 0xC4, 0xDF, 0x72, 0xF8, 0xC6, 0x55, 0xE4, 0x7B, 0x14, 0x36, 0x18, 0x3B, 0xA7, 0xD1, 0x20, 0x81, 0x22, 0xD1, 0xA9, 0x18, 0x84, 0x65, 0x13, 0x0B, 0xED, 0xA3, 0x00, 0xE5, 0xD9]; - public static RSAParameters RSAParameters = new RSAParameters() - { - Exponent = [0x01, 0x00, 0x01], - Modulus = [0x89, 0xD6, 0x66, 0x00, 0x7D, 0xFC, 0x7D, 0xCE, 0x83, 0xA6, 0x62, 0xE3, 0x1A, 0x5E, 0x9A, 0x53, 0xC7, 0x8A, 0x27, 0xF3, 0x67, 0xC1, 0xF3, 0xD4, 0x37, 0xFE, 0x50, 0x6D, 0x38, 0x45, 0xDF, 0x7E, 0x73, 0x5C, 0xF4, 0x9D, 0x40, 0x4C, 0x8C, 0x63, 0x21, 0x97, 0xDF, 0x46, 0xFF, 0xB2, 0x0D, 0x0E, 0xDB, 0xB2, 0x72, 0xB4, 0xA8, 0x42, 0xCD, 0xEE, 0x48, 0x06, 0x74, 0x4F, 0xE9, 0x56, 0x6E, 0x9A, 0xB1, 0x60, 0x18, 0xBC, 0x86, 0x0B, 0xB6, 0x32, 0xA7, 0x51, 0x00, 0x85, 0x7B, 0xC8, 0x72, 0xCE, 0x53, 0x71, 0x3F, 0x64, 0xC2, 0x25, 0x58, 0xEF, 0xB0, 0xC9, 0x1D, 0xE3, 0xB3, 0x8E, 0xFC, 0x55, 0xCF, 0x8B, 0x02, 0xA5, 0xC8, 0x1E, 0xA7, 0x0E, 0x26, 0x59, 0xA8, 0x33, 0xA5, 0xF1, 0x11, 0xDB, 0xCB, 0xD3, 0xA7, 0x1F, 0xB1, 0xC6, 0x10, 0x39, 0xC8, 0x31, 0x1D, 0x60, 0xDB, 0x0D, 0xA4, 0x13, 0x4B, 0x2B, 0x0E, 0xF3, 0x6F, 0x69, 0xCB, 0xA8, 0x62, 0x03, 0x69, 0xE6, 0x95, 0x6B, 0x8D, 0x11, 0xF6, 0xAF, 0xD9, 0xC2, 0x27, 0x3A, 0x32, 0x12, 0x05, 0xC3, 0xB1, 0xE2, 0x81, 0x4B, 0x40, 0xF8, 0x8B, 0x8D, 0xBA, 0x1F, 0x55, 0x60, 0x2C, 0x09, 0xC6, 0xED, 0x73, 0x96, 0x32, 0xAF, 0x5F, 0xEE, 0x8F, 0xEB, 0x5B, 0x93, 0xCF, 0x73, 0x13, 0x15, 0x6B, 0x92, 0x7B, 0x27, 0x0A, 0x13, 0xF0, 0x03, 0x4D, 0x6F, 0x5E, 0x40, 0x7B, 0x9B, 0xD5, 0xCE, 0xFC, 0x04, 0x97, 0x7E, 0xAA, 0xA3, 0x53, 0x2A, 0xCF, 0xD2, 0xD5, 0xCF, 0x52, 0xB2, 0x40, 0x61, 0x28, 0xB1, 0xA6, 0xF6, 0x78, 0xFB, 0x69, 0x9A, 0x85, 0xD6, 0xB9, 0x13, 0x14, 0x6D, 0xC4, 0x25, 0x36, 0x17, 0xDB, 0x54, 0x0C, 0xD8, 0x77, 0x80, 0x9A, 0x00, 0x62, 0x83, 0xDD, 0xB0, 0x06, 0x64, 0xD0, 0x81, 0x5B, 0x0D, 0x23, 0x9E, 0x88, 0xBD], - DP = null - }; - - // Fields - private static StaticDataParser? _instance; - public static StaticDataParser Instance + private static GameData? _instance; + public static GameData Instance { get { @@ -56,22 +43,21 @@ namespace nksrv.StaticInfo public byte[] Sha256Hash; public int Size; - static async Task BuildAsync() + static async Task BuildAsync() { - Logger.Info("Decrypting static data"); await Load(); - Logger.Info("Loading static data"); + Logger.Info("Preparing"); var stopWatch = new Stopwatch(); stopWatch.Start(); await Instance.Parse(); stopWatch.Stop(); - Console.WriteLine("Parsing took " + stopWatch.Elapsed); + Console.WriteLine("Preparing took " + stopWatch.Elapsed); return Instance; } - public StaticDataParser(string filePath) + public GameData(string filePath) { if (!File.Exists(filePath)) throw new ArgumentException("Static data file must exist", nameof(filePath)); @@ -91,16 +77,23 @@ namespace nksrv.StaticInfo Sha256Hash = SHA256.HashData(rawBytes); Size = rawBytes.Length; - DecryptStaticDataAndLoadZip(filePath); + LoadGameData(filePath); if (MainZip == null) throw new Exception("failed to read zip file"); } - #region Decryption - private void DecryptStaticDataAndLoadZip(string file) + #region Data loading + private static byte[] PresharedValue = [0xCB, 0xC2, 0x1C, 0x6F, 0xF3, 0xF5, 0x07, 0xF5, 0x05, 0xBA, 0xCA, 0xD4, 0x98, 0x28, 0x84, 0x1F, 0xF0, 0xD1, 0x38, 0xC7, 0x61, 0xDF, 0xD6, 0xE6, 0x64, 0x9A, 0x85, 0x13, 0x3E, 0x1A, 0x6A, 0x0C, 0x68, 0x0E, 0x2B, 0xC4, 0xDF, 0x72, 0xF8, 0xC6, 0x55, 0xE4, 0x7B, 0x14, 0x36, 0x18, 0x3B, 0xA7, 0xD1, 0x20, 0x81, 0x22, 0xD1, 0xA9, 0x18, 0x84, 0x65, 0x13, 0x0B, 0xED, 0xA3, 0x00, 0xE5, 0xD9]; + private static RSAParameters LoadParameters = new RSAParameters() + { + Exponent = [0x01, 0x00, 0x01], + Modulus = [0x89, 0xD6, 0x66, 0x00, 0x7D, 0xFC, 0x7D, 0xCE, 0x83, 0xA6, 0x62, 0xE3, 0x1A, 0x5E, 0x9A, 0x53, 0xC7, 0x8A, 0x27, 0xF3, 0x67, 0xC1, 0xF3, 0xD4, 0x37, 0xFE, 0x50, 0x6D, 0x38, 0x45, 0xDF, 0x7E, 0x73, 0x5C, 0xF4, 0x9D, 0x40, 0x4C, 0x8C, 0x63, 0x21, 0x97, 0xDF, 0x46, 0xFF, 0xB2, 0x0D, 0x0E, 0xDB, 0xB2, 0x72, 0xB4, 0xA8, 0x42, 0xCD, 0xEE, 0x48, 0x06, 0x74, 0x4F, 0xE9, 0x56, 0x6E, 0x9A, 0xB1, 0x60, 0x18, 0xBC, 0x86, 0x0B, 0xB6, 0x32, 0xA7, 0x51, 0x00, 0x85, 0x7B, 0xC8, 0x72, 0xCE, 0x53, 0x71, 0x3F, 0x64, 0xC2, 0x25, 0x58, 0xEF, 0xB0, 0xC9, 0x1D, 0xE3, 0xB3, 0x8E, 0xFC, 0x55, 0xCF, 0x8B, 0x02, 0xA5, 0xC8, 0x1E, 0xA7, 0x0E, 0x26, 0x59, 0xA8, 0x33, 0xA5, 0xF1, 0x11, 0xDB, 0xCB, 0xD3, 0xA7, 0x1F, 0xB1, 0xC6, 0x10, 0x39, 0xC8, 0x31, 0x1D, 0x60, 0xDB, 0x0D, 0xA4, 0x13, 0x4B, 0x2B, 0x0E, 0xF3, 0x6F, 0x69, 0xCB, 0xA8, 0x62, 0x03, 0x69, 0xE6, 0x95, 0x6B, 0x8D, 0x11, 0xF6, 0xAF, 0xD9, 0xC2, 0x27, 0x3A, 0x32, 0x12, 0x05, 0xC3, 0xB1, 0xE2, 0x81, 0x4B, 0x40, 0xF8, 0x8B, 0x8D, 0xBA, 0x1F, 0x55, 0x60, 0x2C, 0x09, 0xC6, 0xED, 0x73, 0x96, 0x32, 0xAF, 0x5F, 0xEE, 0x8F, 0xEB, 0x5B, 0x93, 0xCF, 0x73, 0x13, 0x15, 0x6B, 0x92, 0x7B, 0x27, 0x0A, 0x13, 0xF0, 0x03, 0x4D, 0x6F, 0x5E, 0x40, 0x7B, 0x9B, 0xD5, 0xCE, 0xFC, 0x04, 0x97, 0x7E, 0xAA, 0xA3, 0x53, 0x2A, 0xCF, 0xD2, 0xD5, 0xCF, 0x52, 0xB2, 0x40, 0x61, 0x28, 0xB1, 0xA6, 0xF6, 0x78, 0xFB, 0x69, 0x9A, 0x85, 0xD6, 0xB9, 0x13, 0x14, 0x6D, 0xC4, 0x25, 0x36, 0x17, 0xDB, 0x54, 0x0C, 0xD8, 0x77, 0x80, 0x9A, 0x00, 0x62, 0x83, 0xDD, 0xB0, 0x06, 0x64, 0xD0, 0x81, 0x5B, 0x0D, 0x23, 0x9E, 0x88, 0xBD], + DP = null + }; + private void LoadGameData(string file) { using var fileStream = File.Open(file, FileMode.Open, FileAccess.Read); - var keyDecryptor = new Rfc2898DeriveBytes(PresharedKey, GameConfig.Root.StaticData.GetSalt2Bytes(), 10000, HashAlgorithmName.SHA256); - var key2 = keyDecryptor.GetBytes(32); + var a = new Rfc2898DeriveBytes(PresharedValue, GameConfig.Root.StaticData.GetSalt2Bytes(), 10000, HashAlgorithmName.SHA256); + var key2 = a.GetBytes(32); byte[] decryptionKey = key2[0..16]; byte[] iv = key2[16..32]; @@ -111,22 +104,18 @@ namespace nksrv.StaticInfo aes.Key = decryptionKey; aes.IV = iv; var transform = aes.CreateDecryptor(); - - // Decryption layer 1 using CryptoStream stream = new CryptoStream(fileStream, transform, CryptoStreamMode.Read); using MemoryStream ms = new MemoryStream(); stream.CopyTo(ms); var bytes = ms.ToArray(); - - // Decryption of layer 2 var zip = new ZipFile(ms, false); var signEntry = zip.GetEntry("sign"); - if (signEntry == null) throw new Exception("Sign entry not found in decrypted static data pack"); + if (signEntry == null) throw new Exception("error 1"); var dataEntry = zip.GetEntry("data"); - if (dataEntry == null) throw new Exception("Data entry not found in decrypted static data pack"); + if (dataEntry == null) throw new Exception("error 2"); var signStream = zip.GetInputStream(signEntry); var dataStream = zip.GetInputStream(dataEntry); @@ -138,28 +127,26 @@ namespace nksrv.StaticInfo dataStream.CopyTo(dataMs); dataMs.Position = 0; - var rsa = RSA.Create(RSAParameters); + var rsa = RSA.Create(LoadParameters); if (!rsa.VerifyData(dataMs, signMs.ToArray(), HashAlgorithmName.SHA256, RSASignaturePadding.Pkcs1)) - throw new Exception("failed to decrypt static data (round 2)"); + throw new Exception("error 3"); dataMs.Position = 0; - - // Decryption of layer 3 - var keyDecryptor2 = new Rfc2898DeriveBytes(PresharedKey, GameConfig.Root.StaticData.GetSalt1Bytes(), 10000, HashAlgorithmName.SHA256); + var keyDecryptor2 = new Rfc2898DeriveBytes(PresharedValue, GameConfig.Root.StaticData.GetSalt1Bytes(), 10000, HashAlgorithmName.SHA256); var key3 = keyDecryptor2.GetBytes(32); - byte[] decryptionKey2 = key3[0..16]; + byte[] val2 = key3[0..16]; byte[] iv2 = key3[16..32]; ZipStream = new MemoryStream(); - AesCtrTransform(decryptionKey2, iv2, dataMs, ZipStream); + DoTransformation(val2, iv2, dataMs, ZipStream); ZipStream.Position = 0; MainZip = new ZipFile(ZipStream, false); } - public static void AesCtrTransform(byte[] key, byte[] salt, Stream inputStream, Stream outputStream) + public static void DoTransformation(byte[] key, byte[] salt, Stream inputStream, Stream outputStream) { SymmetricAlgorithm aes = Aes.Create(); aes.Mode = CipherMode.ECB; diff --git a/nksrv/StaticInfo/JsonStaticData.cs b/EpinelPS/GameData/JsonStaticData.cs similarity index 99% rename from nksrv/StaticInfo/JsonStaticData.cs rename to EpinelPS/GameData/JsonStaticData.cs index c001032..977351e 100644 --- a/nksrv/StaticInfo/JsonStaticData.cs +++ b/EpinelPS/GameData/JsonStaticData.cs @@ -1,4 +1,4 @@ -namespace nksrv.StaticInfo +namespace EpinelPS.StaticInfo { public class MainQuestCompletionRecord { diff --git a/nksrv/IntlServer/AutoLoginEndpoint.cs b/EpinelPS/IntlServer/AutoLoginEndpoint.cs similarity index 98% rename from nksrv/IntlServer/AutoLoginEndpoint.cs rename to EpinelPS/IntlServer/AutoLoginEndpoint.cs index 20f1366..eac64ea 100644 --- a/nksrv/IntlServer/AutoLoginEndpoint.cs +++ b/EpinelPS/IntlServer/AutoLoginEndpoint.cs @@ -1,4 +1,4 @@ -namespace nksrv.IntlServer +namespace EpinelPS.IntlServer { internal class AutoLoginEndpoint : IntlMsgHandler { diff --git a/nksrv/IntlServer/CodeStatusEndpoint.cs b/EpinelPS/IntlServer/CodeStatusEndpoint.cs similarity index 91% rename from nksrv/IntlServer/CodeStatusEndpoint.cs rename to EpinelPS/IntlServer/CodeStatusEndpoint.cs index 8e4c440..8bd067d 100644 --- a/nksrv/IntlServer/CodeStatusEndpoint.cs +++ b/EpinelPS/IntlServer/CodeStatusEndpoint.cs @@ -1,4 +1,4 @@ -namespace nksrv.IntlServer +namespace EpinelPS.IntlServer { public class CodeStatusEndpoint : IntlMsgHandler { diff --git a/nksrv/IntlServer/GetNoticeContent.cs b/EpinelPS/IntlServer/GetNoticeContent.cs similarity index 98% rename from nksrv/IntlServer/GetNoticeContent.cs rename to EpinelPS/IntlServer/GetNoticeContent.cs index b9e2bc9..a88273a 100644 --- a/nksrv/IntlServer/GetNoticeContent.cs +++ b/EpinelPS/IntlServer/GetNoticeContent.cs @@ -1,4 +1,4 @@ -namespace nksrv.IntlServer +namespace EpinelPS.IntlServer { public class GetNoticeContent : IntlMsgHandler { diff --git a/nksrv/IntlServer/IntlAccountRedirect.cs b/EpinelPS/IntlServer/IntlAccountRedirect.cs similarity index 97% rename from nksrv/IntlServer/IntlAccountRedirect.cs rename to EpinelPS/IntlServer/IntlAccountRedirect.cs index 1360e46..2aff8df 100644 --- a/nksrv/IntlServer/IntlAccountRedirect.cs +++ b/EpinelPS/IntlServer/IntlAccountRedirect.cs @@ -1,8 +1,8 @@ -using nksrv.Utils; +using EpinelPS.Utils; using System.Net; using System.Net.Http.Headers; -namespace nksrv.IntlServer +namespace EpinelPS.IntlServer { /// /// redirect for /account endponts diff --git a/nksrv/IntlServer/IntlAccountRegisterEndpoint.cs b/EpinelPS/IntlServer/IntlAccountRegisterEndpoint.cs similarity index 95% rename from nksrv/IntlServer/IntlAccountRegisterEndpoint.cs rename to EpinelPS/IntlServer/IntlAccountRegisterEndpoint.cs index 11cb67b..793bb02 100644 --- a/nksrv/IntlServer/IntlAccountRegisterEndpoint.cs +++ b/EpinelPS/IntlServer/IntlAccountRegisterEndpoint.cs @@ -1,11 +1,11 @@ using EmbedIO; using Newtonsoft.Json; -using nksrv.Database; -using nksrv.Utils; +using EpinelPS.Database; +using EpinelPS.Utils; using System.Net; -using static nksrv.IntlServer.IntlLogin2Endpoint; +using static EpinelPS.IntlServer.IntlLogin2Endpoint; -namespace nksrv.IntlServer +namespace EpinelPS.IntlServer { public class IntlAccountRegisterEndpoint : IntlMsgHandler { diff --git a/nksrv/IntlServer/IntlGetAccountInfo.cs b/EpinelPS/IntlServer/IntlGetAccountInfo.cs similarity index 96% rename from nksrv/IntlServer/IntlGetAccountInfo.cs rename to EpinelPS/IntlServer/IntlGetAccountInfo.cs index f313657..9a70f43 100644 --- a/nksrv/IntlServer/IntlGetAccountInfo.cs +++ b/EpinelPS/IntlServer/IntlGetAccountInfo.cs @@ -1,4 +1,4 @@ -namespace nksrv.IntlServer +namespace EpinelPS.IntlServer { internal class IntlGetAccountInfo : IntlMsgHandler { diff --git a/nksrv/IntlServer/IntlGetProfileBindInfo.cs b/EpinelPS/IntlServer/IntlGetProfileBindInfo.cs similarity index 97% rename from nksrv/IntlServer/IntlGetProfileBindInfo.cs rename to EpinelPS/IntlServer/IntlGetProfileBindInfo.cs index 69a1cd7..8c71f32 100644 --- a/nksrv/IntlServer/IntlGetProfileBindInfo.cs +++ b/EpinelPS/IntlServer/IntlGetProfileBindInfo.cs @@ -1,5 +1,5 @@  -namespace nksrv.IntlServer +namespace EpinelPS.IntlServer { internal class IntlGetProfileBindInfo : IntlMsgHandler { diff --git a/nksrv/IntlServer/IntlGetProfileInfo.cs b/EpinelPS/IntlServer/IntlGetProfileInfo.cs similarity index 97% rename from nksrv/IntlServer/IntlGetProfileInfo.cs rename to EpinelPS/IntlServer/IntlGetProfileInfo.cs index f39c18d..14f9331 100644 --- a/nksrv/IntlServer/IntlGetProfileInfo.cs +++ b/EpinelPS/IntlServer/IntlGetProfileInfo.cs @@ -1,4 +1,4 @@ -namespace nksrv.IntlServer +namespace EpinelPS.IntlServer { public class IntlGetProfileInfo : IntlMsgHandler { diff --git a/nksrv/IntlServer/IntlHandler.cs b/EpinelPS/IntlServer/IntlHandler.cs similarity index 98% rename from nksrv/IntlServer/IntlHandler.cs rename to EpinelPS/IntlServer/IntlHandler.cs index 538d611..edd226b 100644 --- a/nksrv/IntlServer/IntlHandler.cs +++ b/EpinelPS/IntlServer/IntlHandler.cs @@ -1,8 +1,8 @@ using EmbedIO; -using nksrv.Database; -using nksrv.Utils; +using EpinelPS.Database; +using EpinelPS.Utils; -namespace nksrv.IntlServer +namespace EpinelPS.IntlServer { public static class IntlHandler { diff --git a/nksrv/IntlServer/IntlLogin1Endpoint.cs b/EpinelPS/IntlServer/IntlLogin1Endpoint.cs similarity index 94% rename from nksrv/IntlServer/IntlLogin1Endpoint.cs rename to EpinelPS/IntlServer/IntlLogin1Endpoint.cs index a91db84..4ebb99e 100644 --- a/nksrv/IntlServer/IntlLogin1Endpoint.cs +++ b/EpinelPS/IntlServer/IntlLogin1Endpoint.cs @@ -1,10 +1,10 @@ using EmbedIO; using Newtonsoft.Json; -using nksrv.Database; +using EpinelPS.Database; using System.Net; -using static nksrv.IntlServer.IntlLogin2Endpoint; +using static EpinelPS.IntlServer.IntlLogin2Endpoint; -namespace nksrv.IntlServer +namespace EpinelPS.IntlServer { public class IntlLogin1Endpoint : IntlMsgHandler { diff --git a/nksrv/IntlServer/IntlLogin2Endpoint.cs b/EpinelPS/IntlServer/IntlLogin2Endpoint.cs similarity index 98% rename from nksrv/IntlServer/IntlLogin2Endpoint.cs rename to EpinelPS/IntlServer/IntlLogin2Endpoint.cs index b5608f3..ab4def3 100644 --- a/nksrv/IntlServer/IntlLogin2Endpoint.cs +++ b/EpinelPS/IntlServer/IntlLogin2Endpoint.cs @@ -1,9 +1,9 @@ using EmbedIO; using Newtonsoft.Json; -using nksrv.Database; +using EpinelPS.Database; using System.Net; -namespace nksrv.IntlServer +namespace EpinelPS.IntlServer { /// /// This handles the login endpoint. diff --git a/nksrv/IntlServer/IntlMsgHandler.cs b/EpinelPS/IntlServer/IntlMsgHandler.cs similarity index 98% rename from nksrv/IntlServer/IntlMsgHandler.cs rename to EpinelPS/IntlServer/IntlMsgHandler.cs index 5def769..1a2909f 100644 --- a/nksrv/IntlServer/IntlMsgHandler.cs +++ b/EpinelPS/IntlServer/IntlMsgHandler.cs @@ -1,10 +1,10 @@ using EmbedIO; using Newtonsoft.Json; -using nksrv.Database; +using EpinelPS.Database; using Swan.Logging; using System.Text; -namespace nksrv.IntlServer +namespace EpinelPS.IntlServer { public abstract class IntlMsgHandler { diff --git a/nksrv/IntlServer/IntlQueryAccountInfo.cs b/EpinelPS/IntlServer/IntlQueryAccountInfo.cs similarity index 96% rename from nksrv/IntlServer/IntlQueryAccountInfo.cs rename to EpinelPS/IntlServer/IntlQueryAccountInfo.cs index c4f5f48..69a695a 100644 --- a/nksrv/IntlServer/IntlQueryAccountInfo.cs +++ b/EpinelPS/IntlServer/IntlQueryAccountInfo.cs @@ -1,4 +1,4 @@ -namespace nksrv.IntlServer +namespace EpinelPS.IntlServer { internal class IntlQueryAccountInfo : IntlMsgHandler { diff --git a/nksrv/IntlServer/IntlReturnJsonHandler.cs b/EpinelPS/IntlServer/IntlReturnJsonHandler.cs similarity index 92% rename from nksrv/IntlServer/IntlReturnJsonHandler.cs rename to EpinelPS/IntlServer/IntlReturnJsonHandler.cs index fdc6bc6..267153a 100644 --- a/nksrv/IntlServer/IntlReturnJsonHandler.cs +++ b/EpinelPS/IntlServer/IntlReturnJsonHandler.cs @@ -1,4 +1,4 @@ -namespace nksrv.IntlServer +namespace EpinelPS.IntlServer { public class IntlReturnJsonHandler : IntlMsgHandler { diff --git a/nksrv/IntlServer/JuniperLauncherGetRegion.cs b/EpinelPS/IntlServer/JuniperLauncherGetRegion.cs similarity index 97% rename from nksrv/IntlServer/JuniperLauncherGetRegion.cs rename to EpinelPS/IntlServer/JuniperLauncherGetRegion.cs index 6e5718b..c85d143 100644 --- a/nksrv/IntlServer/JuniperLauncherGetRegion.cs +++ b/EpinelPS/IntlServer/JuniperLauncherGetRegion.cs @@ -4,7 +4,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace nksrv.IntlServer +namespace EpinelPS.IntlServer { internal class JuniperLauncherGetRegion : IntlMsgHandler { diff --git a/nksrv/IntlServer/JuniperLauncherGetRepoVersion.cs b/EpinelPS/IntlServer/JuniperLauncherGetRepoVersion.cs similarity index 93% rename from nksrv/IntlServer/JuniperLauncherGetRepoVersion.cs rename to EpinelPS/IntlServer/JuniperLauncherGetRepoVersion.cs index 49b3560..711cdbf 100644 --- a/nksrv/IntlServer/JuniperLauncherGetRepoVersion.cs +++ b/EpinelPS/IntlServer/JuniperLauncherGetRepoVersion.cs @@ -4,7 +4,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace nksrv.IntlServer +namespace EpinelPS.IntlServer { internal class JuniperLauncherGetRepoVersion : IntlMsgHandler { diff --git a/nksrv/IntlServer/JupiterAuthLogin.cs b/EpinelPS/IntlServer/JupiterAuthLogin.cs similarity index 95% rename from nksrv/IntlServer/JupiterAuthLogin.cs rename to EpinelPS/IntlServer/JupiterAuthLogin.cs index e5cfade..cb01b8f 100644 --- a/nksrv/IntlServer/JupiterAuthLogin.cs +++ b/EpinelPS/IntlServer/JupiterAuthLogin.cs @@ -4,7 +4,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace nksrv.IntlServer +namespace EpinelPS.IntlServer { internal class JupiterAuthLogin : IntlMsgHandler { diff --git a/nksrv/IntlServer/JupterGetGameLauncher.cs b/EpinelPS/IntlServer/JupterGetGameLauncher.cs similarity index 96% rename from nksrv/IntlServer/JupterGetGameLauncher.cs rename to EpinelPS/IntlServer/JupterGetGameLauncher.cs index d0ddffd..1f917f5 100644 --- a/nksrv/IntlServer/JupterGetGameLauncher.cs +++ b/EpinelPS/IntlServer/JupterGetGameLauncher.cs @@ -4,7 +4,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace nksrv.IntlServer +namespace EpinelPS.IntlServer { internal class JuniperLauncherGetGameLauncher : IntlMsgHandler { diff --git a/nksrv/IntlServer/SendCodeEndpoint.cs b/EpinelPS/IntlServer/SendCodeEndpoint.cs similarity index 93% rename from nksrv/IntlServer/SendCodeEndpoint.cs rename to EpinelPS/IntlServer/SendCodeEndpoint.cs index 5a007c2..6b026f6 100644 --- a/nksrv/IntlServer/SendCodeEndpoint.cs +++ b/EpinelPS/IntlServer/SendCodeEndpoint.cs @@ -1,10 +1,10 @@ using EmbedIO; using Newtonsoft.Json; -using nksrv.Database; +using EpinelPS.Database; using System.Net; -using static nksrv.IntlServer.IntlLogin2Endpoint; +using static EpinelPS.IntlServer.IntlLogin2Endpoint; -namespace nksrv.IntlServer +namespace EpinelPS.IntlServer { public class SendCodeEndpoint : IntlMsgHandler { diff --git a/nksrv/LobbyServer/LobbyHandler.cs b/EpinelPS/LobbyServer/LobbyHandler.cs similarity index 98% rename from nksrv/LobbyServer/LobbyHandler.cs rename to EpinelPS/LobbyServer/LobbyHandler.cs index 1b95453..563b61e 100644 --- a/nksrv/LobbyServer/LobbyHandler.cs +++ b/EpinelPS/LobbyServer/LobbyHandler.cs @@ -1,11 +1,11 @@ using ASodium; using EmbedIO; using Google.Protobuf; -using nksrv.Database; -using nksrv.Utils; +using EpinelPS.Database; +using EpinelPS.Utils; using Swan.Logging; -namespace nksrv.LobbyServer +namespace EpinelPS.LobbyServer { public static class LobbyHandler { diff --git a/nksrv/LobbyServer/LobbyMsgHandler.cs b/EpinelPS/LobbyServer/LobbyMsgHandler.cs similarity index 97% rename from nksrv/LobbyServer/LobbyMsgHandler.cs rename to EpinelPS/LobbyServer/LobbyMsgHandler.cs index 84713e1..b26d0c7 100644 --- a/nksrv/LobbyServer/LobbyMsgHandler.cs +++ b/EpinelPS/LobbyServer/LobbyMsgHandler.cs @@ -1,9 +1,9 @@ using EmbedIO; using Google.Protobuf; -using nksrv.Database; -using nksrv.Utils; +using EpinelPS.Database; +using EpinelPS.Utils; -namespace nksrv.LobbyServer +namespace EpinelPS.LobbyServer { public abstract class LobbyMsgHandler { diff --git a/nksrv/LobbyServer/Msgs/Antibot/BattleReportData.cs b/EpinelPS/LobbyServer/Msgs/Antibot/BattleReportData.cs similarity index 85% rename from nksrv/LobbyServer/Msgs/Antibot/BattleReportData.cs rename to EpinelPS/LobbyServer/Msgs/Antibot/BattleReportData.cs index 6d34126..8777299 100644 --- a/nksrv/LobbyServer/Msgs/Antibot/BattleReportData.cs +++ b/EpinelPS/LobbyServer/Msgs/Antibot/BattleReportData.cs @@ -1,6 +1,6 @@ -using nksrv.Utils; +using EpinelPS.Utils; -namespace nksrv.LobbyServer.Msgs.Antibot +namespace EpinelPS.LobbyServer.Msgs.Antibot { [PacketPath("/antibot/battlereportdata")] public class BattleReportData : LobbyMsgHandler diff --git a/nksrv/LobbyServer/Msgs/Antibot/RecieveAntibotData.cs b/EpinelPS/LobbyServer/Msgs/Antibot/RecieveAntibotData.cs similarity index 86% rename from nksrv/LobbyServer/Msgs/Antibot/RecieveAntibotData.cs rename to EpinelPS/LobbyServer/Msgs/Antibot/RecieveAntibotData.cs index 9d39ad0..454cf17 100644 --- a/nksrv/LobbyServer/Msgs/Antibot/RecieveAntibotData.cs +++ b/EpinelPS/LobbyServer/Msgs/Antibot/RecieveAntibotData.cs @@ -1,6 +1,6 @@ -using nksrv.Utils; +using EpinelPS.Utils; -namespace nksrv.LobbyServer.Msgs.Antibot +namespace EpinelPS.LobbyServer.Msgs.Antibot { [PacketPath("/antibot/recvdata")] public class RecieveAntibotData : LobbyMsgHandler diff --git a/nksrv/LobbyServer/Msgs/Archive/CheckBookmarkScenarioExists.cs b/EpinelPS/LobbyServer/Msgs/Archive/CheckBookmarkScenarioExists.cs similarity index 84% rename from nksrv/LobbyServer/Msgs/Archive/CheckBookmarkScenarioExists.cs rename to EpinelPS/LobbyServer/Msgs/Archive/CheckBookmarkScenarioExists.cs index a2550d9..7e277bc 100644 --- a/nksrv/LobbyServer/Msgs/Archive/CheckBookmarkScenarioExists.cs +++ b/EpinelPS/LobbyServer/Msgs/Archive/CheckBookmarkScenarioExists.cs @@ -1,6 +1,6 @@ -using nksrv.Utils; +using EpinelPS.Utils; -namespace nksrv.LobbyServer.Msgs.Archive +namespace EpinelPS.LobbyServer.Msgs.Archive { [PacketPath("/bookmark/scenario/exist")] public class CheckBookmarkScenarioExists : LobbyMsgHandler diff --git a/nksrv/LobbyServer/Msgs/Archive/GetArchives.cs b/EpinelPS/LobbyServer/Msgs/Archive/GetArchives.cs similarity index 90% rename from nksrv/LobbyServer/Msgs/Archive/GetArchives.cs rename to EpinelPS/LobbyServer/Msgs/Archive/GetArchives.cs index 9bd6bea..215045c 100644 --- a/nksrv/LobbyServer/Msgs/Archive/GetArchives.cs +++ b/EpinelPS/LobbyServer/Msgs/Archive/GetArchives.cs @@ -1,6 +1,6 @@ -using nksrv.Utils; +using EpinelPS.Utils; -namespace nksrv.LobbyServer.Msgs.Archive +namespace EpinelPS.LobbyServer.Msgs.Archive { [PacketPath("/archive/get")] public class GetArchives : LobbyMsgHandler diff --git a/nksrv/LobbyServer/Msgs/Arena/GetArenaBanInfo.cs b/EpinelPS/LobbyServer/Msgs/Arena/GetArenaBanInfo.cs similarity index 84% rename from nksrv/LobbyServer/Msgs/Arena/GetArenaBanInfo.cs rename to EpinelPS/LobbyServer/Msgs/Arena/GetArenaBanInfo.cs index 97f53e2..3be9dd7 100644 --- a/nksrv/LobbyServer/Msgs/Arena/GetArenaBanInfo.cs +++ b/EpinelPS/LobbyServer/Msgs/Arena/GetArenaBanInfo.cs @@ -1,6 +1,6 @@ -using nksrv.Utils; +using EpinelPS.Utils; -namespace nksrv.LobbyServer.Msgs.Arena +namespace EpinelPS.LobbyServer.Msgs.Arena { [PacketPath("/arena/getbaninfo")] public class GetArenaBanInfo : LobbyMsgHandler diff --git a/nksrv/LobbyServer/Msgs/Arena/ShowSpecialArenaReward.cs b/EpinelPS/LobbyServer/Msgs/Arena/ShowSpecialArenaReward.cs similarity index 85% rename from nksrv/LobbyServer/Msgs/Arena/ShowSpecialArenaReward.cs rename to EpinelPS/LobbyServer/Msgs/Arena/ShowSpecialArenaReward.cs index d5840f0..a1bf61d 100644 --- a/nksrv/LobbyServer/Msgs/Arena/ShowSpecialArenaReward.cs +++ b/EpinelPS/LobbyServer/Msgs/Arena/ShowSpecialArenaReward.cs @@ -1,6 +1,6 @@ -using nksrv.Utils; +using EpinelPS.Utils; -namespace nksrv.LobbyServer.Msgs.Arena +namespace EpinelPS.LobbyServer.Msgs.Arena { [PacketPath("/arena/special/showreward")] public class ShowSpecialArenaReward : LobbyMsgHandler diff --git a/nksrv/LobbyServer/Msgs/Auth/AuthLogout.cs b/EpinelPS/LobbyServer/Msgs/Auth/AuthLogout.cs similarity index 78% rename from nksrv/LobbyServer/Msgs/Auth/AuthLogout.cs rename to EpinelPS/LobbyServer/Msgs/Auth/AuthLogout.cs index 11dd376..7bf869a 100644 --- a/nksrv/LobbyServer/Msgs/Auth/AuthLogout.cs +++ b/EpinelPS/LobbyServer/Msgs/Auth/AuthLogout.cs @@ -1,7 +1,7 @@ -using nksrv.Database; -using nksrv.Utils; +using EpinelPS.Database; +using EpinelPS.Utils; -namespace nksrv.LobbyServer.Msgs.Auth +namespace EpinelPS.LobbyServer.Msgs.Auth { [PacketPath("/auth/logout")] public class AuthLogout : LobbyMsgHandler diff --git a/nksrv/LobbyServer/Msgs/Auth/DoEnterServer.cs b/EpinelPS/LobbyServer/Msgs/Auth/DoEnterServer.cs similarity index 93% rename from nksrv/LobbyServer/Msgs/Auth/DoEnterServer.cs rename to EpinelPS/LobbyServer/Msgs/Auth/DoEnterServer.cs index 866242c..32e66cc 100644 --- a/nksrv/LobbyServer/Msgs/Auth/DoEnterServer.cs +++ b/EpinelPS/LobbyServer/Msgs/Auth/DoEnterServer.cs @@ -1,10 +1,10 @@ using EmbedIO; using Google.Protobuf; using Google.Protobuf.WellKnownTypes; -using nksrv.Database; -using nksrv.Utils; +using EpinelPS.Database; +using EpinelPS.Utils; -namespace nksrv.LobbyServer.Msgs.Auth +namespace EpinelPS.LobbyServer.Msgs.Auth { [PacketPath("/auth/enterserver")] public class GetUserOnlineStateLog : LobbyMsgHandler diff --git a/nksrv/LobbyServer/Msgs/Auth/DoIntlAuth.cs b/EpinelPS/LobbyServer/Msgs/Auth/DoIntlAuth.cs similarity index 95% rename from nksrv/LobbyServer/Msgs/Auth/DoIntlAuth.cs rename to EpinelPS/LobbyServer/Msgs/Auth/DoIntlAuth.cs index 17e5910..961d5fe 100644 --- a/nksrv/LobbyServer/Msgs/Auth/DoIntlAuth.cs +++ b/EpinelPS/LobbyServer/Msgs/Auth/DoIntlAuth.cs @@ -1,9 +1,9 @@ using EmbedIO; using Google.Protobuf.WellKnownTypes; -using nksrv.Database; -using nksrv.Utils; +using EpinelPS.Database; +using EpinelPS.Utils; -namespace nksrv.LobbyServer.Msgs.Auth +namespace EpinelPS.LobbyServer.Msgs.Auth { [PacketPath("/auth/intl")] public class DoIntlAuth : LobbyMsgHandler diff --git a/nksrv/LobbyServer/Msgs/Badge/DeleteBadge.cs b/EpinelPS/LobbyServer/Msgs/Badge/DeleteBadge.cs similarity index 82% rename from nksrv/LobbyServer/Msgs/Badge/DeleteBadge.cs rename to EpinelPS/LobbyServer/Msgs/Badge/DeleteBadge.cs index 1295b55..192d709 100644 --- a/nksrv/LobbyServer/Msgs/Badge/DeleteBadge.cs +++ b/EpinelPS/LobbyServer/Msgs/Badge/DeleteBadge.cs @@ -1,6 +1,6 @@ -using nksrv.Utils; +using EpinelPS.Utils; -namespace nksrv.LobbyServer.Msgs.Badge +namespace EpinelPS.LobbyServer.Msgs.Badge { [PacketPath("/badge/delete")] public class DeleteBadge : LobbyMsgHandler diff --git a/nksrv/LobbyServer/Msgs/Badge/SyncBadge.cs b/EpinelPS/LobbyServer/Msgs/Badge/SyncBadge.cs similarity index 82% rename from nksrv/LobbyServer/Msgs/Badge/SyncBadge.cs rename to EpinelPS/LobbyServer/Msgs/Badge/SyncBadge.cs index d37ee52..15654fe 100644 --- a/nksrv/LobbyServer/Msgs/Badge/SyncBadge.cs +++ b/EpinelPS/LobbyServer/Msgs/Badge/SyncBadge.cs @@ -1,6 +1,6 @@ -using nksrv.Utils; +using EpinelPS.Utils; -namespace nksrv.LobbyServer.Msgs.Badge +namespace EpinelPS.LobbyServer.Msgs.Badge { [PacketPath("/badge/sync")] public class SyncBadge : LobbyMsgHandler diff --git a/nksrv/LobbyServer/Msgs/Campaign/CampaignPackageGetAll.cs b/EpinelPS/LobbyServer/Msgs/Campaign/CampaignPackageGetAll.cs similarity index 85% rename from nksrv/LobbyServer/Msgs/Campaign/CampaignPackageGetAll.cs rename to EpinelPS/LobbyServer/Msgs/Campaign/CampaignPackageGetAll.cs index ba1ece7..6b003e1 100644 --- a/nksrv/LobbyServer/Msgs/Campaign/CampaignPackageGetAll.cs +++ b/EpinelPS/LobbyServer/Msgs/Campaign/CampaignPackageGetAll.cs @@ -1,6 +1,6 @@ -using nksrv.Utils; +using EpinelPS.Utils; -namespace nksrv.LobbyServer.Msgs.Campaign +namespace EpinelPS.LobbyServer.Msgs.Campaign { [PacketPath("/shutdownflags/campaignpackage/getall")] public class CampaignPackageGetAll : LobbyMsgHandler diff --git a/nksrv/LobbyServer/Msgs/Campaign/GetCampaignField.cs b/EpinelPS/LobbyServer/Msgs/Campaign/GetCampaignField.cs similarity index 84% rename from nksrv/LobbyServer/Msgs/Campaign/GetCampaignField.cs rename to EpinelPS/LobbyServer/Msgs/Campaign/GetCampaignField.cs index 0f8d71d..bdf3703 100644 --- a/nksrv/LobbyServer/Msgs/Campaign/GetCampaignField.cs +++ b/EpinelPS/LobbyServer/Msgs/Campaign/GetCampaignField.cs @@ -1,8 +1,8 @@ -using nksrv.LobbyServer.Msgs.Stage; -using nksrv.StaticInfo; -using nksrv.Utils; +using EpinelPS.LobbyServer.Msgs.Stage; +using EpinelPS.StaticInfo; +using EpinelPS.Utils; -namespace nksrv.LobbyServer.Msgs.Campaign +namespace EpinelPS.LobbyServer.Msgs.Campaign { [PacketPath("/campaign/getfield")] public class GetCampaignField : LobbyMsgHandler @@ -15,7 +15,7 @@ namespace nksrv.LobbyServer.Msgs.Campaign Console.WriteLine("Map ID: " + req.MapId); var response = new ResGetCampaignFieldData(); - response.Field = GetStage.CreateFieldInfo(user, StaticDataParser.Instance.GetNormalChapterNumberFromFieldName(req.MapId), req.MapId.Contains("hard") ? "Hard" : "Normal"); + response.Field = GetStage.CreateFieldInfo(user, GameData.Instance.GetNormalChapterNumberFromFieldName(req.MapId), req.MapId.Contains("hard") ? "Hard" : "Normal"); // todo save this data response.Team = new NetUserTeamData() { LastContentsTeamNumber = 1, Type = 1 }; diff --git a/nksrv/LobbyServer/Msgs/Campaign/ObtainItem.cs b/EpinelPS/LobbyServer/Msgs/Campaign/ObtainItem.cs similarity index 75% rename from nksrv/LobbyServer/Msgs/Campaign/ObtainItem.cs rename to EpinelPS/LobbyServer/Msgs/Campaign/ObtainItem.cs index 4b1b272..d8d6c96 100644 --- a/nksrv/LobbyServer/Msgs/Campaign/ObtainItem.cs +++ b/EpinelPS/LobbyServer/Msgs/Campaign/ObtainItem.cs @@ -1,7 +1,7 @@ -using nksrv.StaticInfo; -using nksrv.Utils; +using EpinelPS.StaticInfo; +using EpinelPS.Utils; -namespace nksrv.LobbyServer.Msgs.Campaign +namespace EpinelPS.LobbyServer.Msgs.Campaign { [PacketPath("/campaign/obtain/item")] public class ObtainItem : LobbyMsgHandler @@ -13,7 +13,7 @@ namespace nksrv.LobbyServer.Msgs.Campaign var response = new ResObtainCampaignItem(); - var chapter = StaticDataParser.Instance.GetNormalChapterNumberFromFieldName(req.MapId); + var chapter = GameData.Instance.GetNormalChapterNumberFromFieldName(req.MapId); var mod = req.MapId.Contains("hard") ? "Hard" : "Normal"; var key = chapter + "_" + mod; var field = user.FieldInfoNew[key]; diff --git a/nksrv/LobbyServer/Msgs/Campaign/SaveField.cs b/EpinelPS/LobbyServer/Msgs/Campaign/SaveField.cs similarity index 90% rename from nksrv/LobbyServer/Msgs/Campaign/SaveField.cs rename to EpinelPS/LobbyServer/Msgs/Campaign/SaveField.cs index c3e6ccc..8f24da8 100644 --- a/nksrv/LobbyServer/Msgs/Campaign/SaveField.cs +++ b/EpinelPS/LobbyServer/Msgs/Campaign/SaveField.cs @@ -1,6 +1,6 @@ -using nksrv.Utils; +using EpinelPS.Utils; -namespace nksrv.LobbyServer.Msgs.Campaign +namespace EpinelPS.LobbyServer.Msgs.Campaign { [PacketPath("/campaign/savefield")] public class SaveField : LobbyMsgHandler diff --git a/nksrv/LobbyServer/Msgs/Campaign/SaveFieldObject.cs b/EpinelPS/LobbyServer/Msgs/Campaign/SaveFieldObject.cs similarity index 80% rename from nksrv/LobbyServer/Msgs/Campaign/SaveFieldObject.cs rename to EpinelPS/LobbyServer/Msgs/Campaign/SaveFieldObject.cs index f4c9275..32756da 100644 --- a/nksrv/LobbyServer/Msgs/Campaign/SaveFieldObject.cs +++ b/EpinelPS/LobbyServer/Msgs/Campaign/SaveFieldObject.cs @@ -1,8 +1,8 @@ -using nksrv.Database; -using nksrv.StaticInfo; -using nksrv.Utils; +using EpinelPS.Database; +using EpinelPS.StaticInfo; +using EpinelPS.Utils; -namespace nksrv.LobbyServer.Msgs.Campaign +namespace EpinelPS.LobbyServer.Msgs.Campaign { [PacketPath("/campaign/savefieldobject")] public class SaveFieldObject : LobbyMsgHandler @@ -18,7 +18,7 @@ namespace nksrv.LobbyServer.Msgs.Campaign Console.WriteLine($"save {req.MapId} with {req.FieldObject.PositionID}"); - var chapter = StaticDataParser.Instance.GetNormalChapterNumberFromFieldName(req.MapId); + var chapter = GameData.Instance.GetNormalChapterNumberFromFieldName(req.MapId); var mod = req.MapId.Contains("hard") ? "Hard" : "Normal"; var key = chapter + "_" + mod; var field = user.FieldInfoNew[key]; diff --git a/nksrv/LobbyServer/Msgs/Character/GetCharacterAttractiveList.cs b/EpinelPS/LobbyServer/Msgs/Character/GetCharacterAttractiveList.cs similarity index 87% rename from nksrv/LobbyServer/Msgs/Character/GetCharacterAttractiveList.cs rename to EpinelPS/LobbyServer/Msgs/Character/GetCharacterAttractiveList.cs index 650ad12..701d2da 100644 --- a/nksrv/LobbyServer/Msgs/Character/GetCharacterAttractiveList.cs +++ b/EpinelPS/LobbyServer/Msgs/Character/GetCharacterAttractiveList.cs @@ -1,6 +1,6 @@ -using nksrv.Utils; +using EpinelPS.Utils; -namespace nksrv.LobbyServer.Msgs.Character +namespace EpinelPS.LobbyServer.Msgs.Character { [PacketPath("/character/attractive/get")] public class GetCharacterAttractiveList : LobbyMsgHandler diff --git a/nksrv/LobbyServer/Msgs/Character/GetCharacterCostume.cs b/EpinelPS/LobbyServer/Msgs/Character/GetCharacterCostume.cs similarity index 68% rename from nksrv/LobbyServer/Msgs/Character/GetCharacterCostume.cs rename to EpinelPS/LobbyServer/Msgs/Character/GetCharacterCostume.cs index 2a1171f..9131111 100644 --- a/nksrv/LobbyServer/Msgs/Character/GetCharacterCostume.cs +++ b/EpinelPS/LobbyServer/Msgs/Character/GetCharacterCostume.cs @@ -1,7 +1,7 @@ -using nksrv.StaticInfo; -using nksrv.Utils; +using EpinelPS.StaticInfo; +using EpinelPS.Utils; -namespace nksrv.LobbyServer.Msgs.Character +namespace EpinelPS.LobbyServer.Msgs.Character { [PacketPath("/character/costume/get")] public class GetCharacterCostume : LobbyMsgHandler @@ -13,7 +13,7 @@ namespace nksrv.LobbyServer.Msgs.Character var response = new ResGetCharacterCostumeData(); // return all - response.CostumeIds.AddRange(StaticDataParser.Instance.GetAllCostumes()); + response.CostumeIds.AddRange(GameData.Instance.GetAllCostumes()); await WriteDataAsync(response); } diff --git a/nksrv/LobbyServer/Msgs/Character/GetCharacterData.cs b/EpinelPS/LobbyServer/Msgs/Character/GetCharacterData.cs similarity index 94% rename from nksrv/LobbyServer/Msgs/Character/GetCharacterData.cs rename to EpinelPS/LobbyServer/Msgs/Character/GetCharacterData.cs index 8dcdf7d..1c2c5a1 100644 --- a/nksrv/LobbyServer/Msgs/Character/GetCharacterData.cs +++ b/EpinelPS/LobbyServer/Msgs/Character/GetCharacterData.cs @@ -1,6 +1,6 @@ -using nksrv.Utils; +using EpinelPS.Utils; -namespace nksrv.LobbyServer.Msgs.Character +namespace EpinelPS.LobbyServer.Msgs.Character { [PacketPath("/character/get")] public class GetCharacterData : LobbyMsgHandler diff --git a/nksrv/LobbyServer/Msgs/Character/GetSynchrodevice.cs b/EpinelPS/LobbyServer/Msgs/Character/GetSynchrodevice.cs similarity index 96% rename from nksrv/LobbyServer/Msgs/Character/GetSynchrodevice.cs rename to EpinelPS/LobbyServer/Msgs/Character/GetSynchrodevice.cs index 897402f..0eb1248 100644 --- a/nksrv/LobbyServer/Msgs/Character/GetSynchrodevice.cs +++ b/EpinelPS/LobbyServer/Msgs/Character/GetSynchrodevice.cs @@ -1,6 +1,6 @@ -using nksrv.Utils; +using EpinelPS.Utils; -namespace nksrv.LobbyServer.Msgs.Character +namespace EpinelPS.LobbyServer.Msgs.Character { [PacketPath("/character/synchrodevice/get")] public class GetSynchrodevice : LobbyMsgHandler diff --git a/nksrv/LobbyServer/Msgs/Character/LevelUp.cs b/EpinelPS/LobbyServer/Msgs/Character/LevelUp.cs similarity index 94% rename from nksrv/LobbyServer/Msgs/Character/LevelUp.cs rename to EpinelPS/LobbyServer/Msgs/Character/LevelUp.cs index 5a121b2..1e8f2b8 100644 --- a/nksrv/LobbyServer/Msgs/Character/LevelUp.cs +++ b/EpinelPS/LobbyServer/Msgs/Character/LevelUp.cs @@ -1,9 +1,9 @@ -using nksrv.Database; -using nksrv.StaticInfo; -using nksrv.Utils; +using EpinelPS.Database; +using EpinelPS.StaticInfo; +using EpinelPS.Utils; using Swan.Logging; -namespace nksrv.LobbyServer.Msgs.Character +namespace EpinelPS.LobbyServer.Msgs.Character { [PacketPath("/character/levelup")] public class LevelUp : LobbyMsgHandler @@ -13,7 +13,7 @@ namespace nksrv.LobbyServer.Msgs.Character var req = await ReadData(); var user = GetUser(); var response = new ResCharacterLevelUp(); - var data = StaticDataParser.Instance.GetCharacterLevelUpData(); + var data = GameData.Instance.GetCharacterLevelUpData(); foreach (var item in user.Characters.ToArray()) { diff --git a/nksrv/LobbyServer/Msgs/Character/ResetLevel.cs b/EpinelPS/LobbyServer/Msgs/Character/ResetLevel.cs similarity index 93% rename from nksrv/LobbyServer/Msgs/Character/ResetLevel.cs rename to EpinelPS/LobbyServer/Msgs/Character/ResetLevel.cs index e268bd6..8f9be7b 100644 --- a/nksrv/LobbyServer/Msgs/Character/ResetLevel.cs +++ b/EpinelPS/LobbyServer/Msgs/Character/ResetLevel.cs @@ -1,6 +1,6 @@ -using nksrv.Database; -using nksrv.StaticInfo; -using nksrv.Utils; +using EpinelPS.Database; +using EpinelPS.StaticInfo; +using EpinelPS.Utils; using Swan.Logging; using System; using System.Collections.Generic; @@ -8,7 +8,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace nksrv.LobbyServer.Msgs.Character +namespace EpinelPS.LobbyServer.Msgs.Character { [PacketPath("/character/growreset")] public class ResetLevel : LobbyMsgHandler @@ -18,7 +18,7 @@ namespace nksrv.LobbyServer.Msgs.Character var req = await ReadData(); var user = GetUser(); var response = new ResCharacterGrowReset(); - var data = StaticDataParser.Instance.GetCharacterLevelUpData(); + var data = GameData.Instance.GetCharacterLevelUpData(); foreach (var item in user.Characters.ToArray()) { diff --git a/nksrv/LobbyServer/Msgs/Character/SetCharacterCostume.cs b/EpinelPS/LobbyServer/Msgs/Character/SetCharacterCostume.cs similarity index 87% rename from nksrv/LobbyServer/Msgs/Character/SetCharacterCostume.cs rename to EpinelPS/LobbyServer/Msgs/Character/SetCharacterCostume.cs index 8f858a1..252a2fa 100644 --- a/nksrv/LobbyServer/Msgs/Character/SetCharacterCostume.cs +++ b/EpinelPS/LobbyServer/Msgs/Character/SetCharacterCostume.cs @@ -1,7 +1,7 @@ -using nksrv.Database; -using nksrv.Utils; +using EpinelPS.Database; +using EpinelPS.Utils; -namespace nksrv.LobbyServer.Msgs.Character +namespace EpinelPS.LobbyServer.Msgs.Character { [PacketPath("/character/costume/set")] public class SetCharacterCostume : LobbyMsgHandler diff --git a/nksrv/LobbyServer/Msgs/Event/CompleteEventScenario.cs b/EpinelPS/LobbyServer/Msgs/Event/CompleteEventScenario.cs similarity index 90% rename from nksrv/LobbyServer/Msgs/Event/CompleteEventScenario.cs rename to EpinelPS/LobbyServer/Msgs/Event/CompleteEventScenario.cs index 5101c9f..83df74d 100644 --- a/nksrv/LobbyServer/Msgs/Event/CompleteEventScenario.cs +++ b/EpinelPS/LobbyServer/Msgs/Event/CompleteEventScenario.cs @@ -1,7 +1,7 @@ -using nksrv.Database; -using nksrv.Utils; +using EpinelPS.Database; +using EpinelPS.Utils; -namespace nksrv.LobbyServer.Msgs.Event +namespace EpinelPS.LobbyServer.Msgs.Event { [PacketPath("/event/scenario/complete")] public class CompleteEventScenario : LobbyMsgHandler diff --git a/nksrv/LobbyServer/Msgs/Event/EnterEventField.cs b/EpinelPS/LobbyServer/Msgs/Event/EnterEventField.cs similarity index 84% rename from nksrv/LobbyServer/Msgs/Event/EnterEventField.cs rename to EpinelPS/LobbyServer/Msgs/Event/EnterEventField.cs index d7e423a..0ac695a 100644 --- a/nksrv/LobbyServer/Msgs/Event/EnterEventField.cs +++ b/EpinelPS/LobbyServer/Msgs/Event/EnterEventField.cs @@ -1,6 +1,6 @@ -using nksrv.Utils; +using EpinelPS.Utils; -namespace nksrv.LobbyServer.Msgs.Event +namespace EpinelPS.LobbyServer.Msgs.Event { [PacketPath("/eventfield/enter")] public class EnterEventField : LobbyMsgHandler diff --git a/nksrv/LobbyServer/Msgs/Event/GetClearedMission.cs b/EpinelPS/LobbyServer/Msgs/Event/GetClearedMission.cs similarity index 84% rename from nksrv/LobbyServer/Msgs/Event/GetClearedMission.cs rename to EpinelPS/LobbyServer/Msgs/Event/GetClearedMission.cs index 7c4a81d..27d2b9d 100644 --- a/nksrv/LobbyServer/Msgs/Event/GetClearedMission.cs +++ b/EpinelPS/LobbyServer/Msgs/Event/GetClearedMission.cs @@ -1,6 +1,6 @@ -using nksrv.Utils; +using EpinelPS.Utils; -namespace nksrv.LobbyServer.Msgs.Event +namespace EpinelPS.LobbyServer.Msgs.Event { [PacketPath("/event/mission/getclear")] public class GetClearedMissions : LobbyMsgHandler diff --git a/nksrv/LobbyServer/Msgs/Event/GetEventScenario.cs b/EpinelPS/LobbyServer/Msgs/Event/GetEventScenario.cs similarity index 88% rename from nksrv/LobbyServer/Msgs/Event/GetEventScenario.cs rename to EpinelPS/LobbyServer/Msgs/Event/GetEventScenario.cs index eb11852..1edaf4f 100644 --- a/nksrv/LobbyServer/Msgs/Event/GetEventScenario.cs +++ b/EpinelPS/LobbyServer/Msgs/Event/GetEventScenario.cs @@ -1,7 +1,7 @@ -using nksrv.Database; -using nksrv.Utils; +using EpinelPS.Database; +using EpinelPS.Utils; -namespace nksrv.LobbyServer.Msgs.Event +namespace EpinelPS.LobbyServer.Msgs.Event { [PacketPath("/event/scenario/get")] public class GetEventScenario : LobbyMsgHandler diff --git a/nksrv/LobbyServer/Msgs/Event/GetJoinedEvent.cs b/EpinelPS/LobbyServer/Msgs/Event/GetJoinedEvent.cs similarity index 97% rename from nksrv/LobbyServer/Msgs/Event/GetJoinedEvent.cs rename to EpinelPS/LobbyServer/Msgs/Event/GetJoinedEvent.cs index 6435635..7dfd40b 100644 --- a/nksrv/LobbyServer/Msgs/Event/GetJoinedEvent.cs +++ b/EpinelPS/LobbyServer/Msgs/Event/GetJoinedEvent.cs @@ -1,6 +1,6 @@ -using nksrv.Utils; +using EpinelPS.Utils; -namespace nksrv.LobbyServer.Msgs.Event +namespace EpinelPS.LobbyServer.Msgs.Event { [PacketPath("/event/getjoinedevent")] public class GetJoinedEvent : LobbyMsgHandler diff --git a/nksrv/LobbyServer/Msgs/Event/ListEvents.cs b/EpinelPS/LobbyServer/Msgs/Event/ListEvents.cs similarity index 98% rename from nksrv/LobbyServer/Msgs/Event/ListEvents.cs rename to EpinelPS/LobbyServer/Msgs/Event/ListEvents.cs index 6c62dc7..19d4a15 100644 --- a/nksrv/LobbyServer/Msgs/Event/ListEvents.cs +++ b/EpinelPS/LobbyServer/Msgs/Event/ListEvents.cs @@ -1,6 +1,6 @@ -using nksrv.Utils; +using EpinelPS.Utils; -namespace nksrv.LobbyServer.Msgs.Event +namespace EpinelPS.LobbyServer.Msgs.Event { [PacketPath("/event/list")] public class ListEvents : LobbyMsgHandler diff --git a/nksrv/LobbyServer/Msgs/Event/StoryEvent/GetStoryDungeon.cs b/EpinelPS/LobbyServer/Msgs/Event/StoryEvent/GetStoryDungeon.cs similarity index 89% rename from nksrv/LobbyServer/Msgs/Event/StoryEvent/GetStoryDungeon.cs rename to EpinelPS/LobbyServer/Msgs/Event/StoryEvent/GetStoryDungeon.cs index 5b2a9d2..1de058a 100644 --- a/nksrv/LobbyServer/Msgs/Event/StoryEvent/GetStoryDungeon.cs +++ b/EpinelPS/LobbyServer/Msgs/Event/StoryEvent/GetStoryDungeon.cs @@ -1,11 +1,11 @@ -using nksrv.Utils; +using EpinelPS.Utils; using System; using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; -namespace nksrv.LobbyServer.Msgs.Event.StoryEvent +namespace EpinelPS.LobbyServer.Msgs.Event.StoryEvent { [PacketPath("/event/storydungeon/get")] public class GetStoryDungeon : LobbyMsgHandler diff --git a/nksrv/LobbyServer/Msgs/FavoriteItem/GetFavoriteItemLibrary.cs b/EpinelPS/LobbyServer/Msgs/FavoriteItem/GetFavoriteItemLibrary.cs similarity index 84% rename from nksrv/LobbyServer/Msgs/FavoriteItem/GetFavoriteItemLibrary.cs rename to EpinelPS/LobbyServer/Msgs/FavoriteItem/GetFavoriteItemLibrary.cs index ed7a653..6ee4377 100644 --- a/nksrv/LobbyServer/Msgs/FavoriteItem/GetFavoriteItemLibrary.cs +++ b/EpinelPS/LobbyServer/Msgs/FavoriteItem/GetFavoriteItemLibrary.cs @@ -1,6 +1,6 @@ -using nksrv.Utils; +using EpinelPS.Utils; -namespace nksrv.LobbyServer.Msgs.FavoriteItem +namespace EpinelPS.LobbyServer.Msgs.FavoriteItem { [PacketPath("/favoriteitem/library")] public class GetFavoriteItemLibrary : LobbyMsgHandler diff --git a/nksrv/LobbyServer/Msgs/FavoriteItem/ListFavoriteItem.cs b/EpinelPS/LobbyServer/Msgs/FavoriteItem/ListFavoriteItem.cs similarity index 83% rename from nksrv/LobbyServer/Msgs/FavoriteItem/ListFavoriteItem.cs rename to EpinelPS/LobbyServer/Msgs/FavoriteItem/ListFavoriteItem.cs index 02d7b2f..b2ea6e8 100644 --- a/nksrv/LobbyServer/Msgs/FavoriteItem/ListFavoriteItem.cs +++ b/EpinelPS/LobbyServer/Msgs/FavoriteItem/ListFavoriteItem.cs @@ -1,6 +1,6 @@ -using nksrv.Utils; +using EpinelPS.Utils; -namespace nksrv.LobbyServer.Msgs.FavoriteItem +namespace EpinelPS.LobbyServer.Msgs.FavoriteItem { [PacketPath("/favoriteitem/list")] public class ListFavoriteItem : LobbyMsgHandler diff --git a/nksrv/LobbyServer/Msgs/FavoriteItem/ListFavoriteItemQuests.cs b/EpinelPS/LobbyServer/Msgs/FavoriteItem/ListFavoriteItemQuests.cs similarity index 84% rename from nksrv/LobbyServer/Msgs/FavoriteItem/ListFavoriteItemQuests.cs rename to EpinelPS/LobbyServer/Msgs/FavoriteItem/ListFavoriteItemQuests.cs index 64ac7ef..15342e6 100644 --- a/nksrv/LobbyServer/Msgs/FavoriteItem/ListFavoriteItemQuests.cs +++ b/EpinelPS/LobbyServer/Msgs/FavoriteItem/ListFavoriteItemQuests.cs @@ -1,6 +1,6 @@ -using nksrv.Utils; +using EpinelPS.Utils; -namespace nksrv.LobbyServer.Msgs.FavoriteItem +namespace EpinelPS.LobbyServer.Msgs.FavoriteItem { [PacketPath("/favoriteitem/quest/list")] public class ListFavoriteItemQuests : LobbyMsgHandler diff --git a/nksrv/LobbyServer/Msgs/Friend/GetFriends.cs b/EpinelPS/LobbyServer/Msgs/Friend/GetFriends.cs similarity index 82% rename from nksrv/LobbyServer/Msgs/Friend/GetFriends.cs rename to EpinelPS/LobbyServer/Msgs/Friend/GetFriends.cs index f877dca..be5f098 100644 --- a/nksrv/LobbyServer/Msgs/Friend/GetFriends.cs +++ b/EpinelPS/LobbyServer/Msgs/Friend/GetFriends.cs @@ -1,6 +1,6 @@ -using nksrv.Utils; +using EpinelPS.Utils; -namespace nksrv.LobbyServer.Msgs.Friend +namespace EpinelPS.LobbyServer.Msgs.Friend { [PacketPath("/friend/get")] public class GetFriends : LobbyMsgHandler diff --git a/nksrv/LobbyServer/Msgs/Gacha/CheckGachaDailyEvent.cs b/EpinelPS/LobbyServer/Msgs/Gacha/CheckGachaDailyEvent.cs similarity index 87% rename from nksrv/LobbyServer/Msgs/Gacha/CheckGachaDailyEvent.cs rename to EpinelPS/LobbyServer/Msgs/Gacha/CheckGachaDailyEvent.cs index 8799b55..1c5c5c2 100644 --- a/nksrv/LobbyServer/Msgs/Gacha/CheckGachaDailyEvent.cs +++ b/EpinelPS/LobbyServer/Msgs/Gacha/CheckGachaDailyEvent.cs @@ -1,6 +1,6 @@ -using nksrv.Utils; +using EpinelPS.Utils; -namespace nksrv.LobbyServer.Msgs.Gacha +namespace EpinelPS.LobbyServer.Msgs.Gacha { [PacketPath("/gacha/event/check")] public class CheckGachaDailyEvent : LobbyMsgHandler diff --git a/nksrv/LobbyServer/Msgs/Gacha/ExecGacha.cs b/EpinelPS/LobbyServer/Msgs/Gacha/ExecGacha.cs similarity index 88% rename from nksrv/LobbyServer/Msgs/Gacha/ExecGacha.cs rename to EpinelPS/LobbyServer/Msgs/Gacha/ExecGacha.cs index 0357162..7faf0f4 100644 --- a/nksrv/LobbyServer/Msgs/Gacha/ExecGacha.cs +++ b/EpinelPS/LobbyServer/Msgs/Gacha/ExecGacha.cs @@ -1,8 +1,8 @@ -using nksrv.Database; -using nksrv.StaticInfo; -using nksrv.Utils; +using EpinelPS.Database; +using EpinelPS.StaticInfo; +using EpinelPS.Utils; -namespace nksrv.LobbyServer.Msgs.Gacha +namespace EpinelPS.LobbyServer.Msgs.Gacha { [PacketPath("/gacha/execute")] public class ExecGacha : LobbyMsgHandler @@ -19,7 +19,7 @@ namespace nksrv.LobbyServer.Msgs.Gacha // TODO implement reward response.Reward = new NetRewardData(); - foreach (var c in StaticDataParser.Instance.GetAllCharacterTids()) + foreach (var c in GameData.Instance.GetAllCharacterTids()) { if (!user.HasCharacter(c)) { diff --git a/nksrv/LobbyServer/Msgs/GetCurrentTime.cs b/EpinelPS/LobbyServer/Msgs/GetCurrentTime.cs similarity index 91% rename from nksrv/LobbyServer/Msgs/GetCurrentTime.cs rename to EpinelPS/LobbyServer/Msgs/GetCurrentTime.cs index 6fbcdaa..c5285f4 100644 --- a/nksrv/LobbyServer/Msgs/GetCurrentTime.cs +++ b/EpinelPS/LobbyServer/Msgs/GetCurrentTime.cs @@ -1,7 +1,7 @@ using Google.Protobuf.WellKnownTypes; -using nksrv.Utils; +using EpinelPS.Utils; -namespace nksrv.LobbyServer.Msgs +namespace EpinelPS.LobbyServer.Msgs { [PacketPath("/now")] public class GetCurrentTime : LobbyMsgHandler diff --git a/nksrv/LobbyServer/Msgs/GetGacha.cs b/EpinelPS/LobbyServer/Msgs/GetGacha.cs similarity index 88% rename from nksrv/LobbyServer/Msgs/GetGacha.cs rename to EpinelPS/LobbyServer/Msgs/GetGacha.cs index 5129b4f..2e22a4c 100644 --- a/nksrv/LobbyServer/Msgs/GetGacha.cs +++ b/EpinelPS/LobbyServer/Msgs/GetGacha.cs @@ -1,6 +1,6 @@ -using nksrv.Utils; +using EpinelPS.Utils; -namespace nksrv.LobbyServer.Msgs +namespace EpinelPS.LobbyServer.Msgs { [PacketPath("/Gacha/Get")] public class GetGacha : LobbyMsgHandler diff --git a/nksrv/LobbyServer/Msgs/Intercept/GetInterceptData.cs b/EpinelPS/LobbyServer/Msgs/Intercept/GetInterceptData.cs similarity index 87% rename from nksrv/LobbyServer/Msgs/Intercept/GetInterceptData.cs rename to EpinelPS/LobbyServer/Msgs/Intercept/GetInterceptData.cs index fe1702f..2ecebef 100644 --- a/nksrv/LobbyServer/Msgs/Intercept/GetInterceptData.cs +++ b/EpinelPS/LobbyServer/Msgs/Intercept/GetInterceptData.cs @@ -1,12 +1,12 @@ -using nksrv.Net; -using nksrv.Utils; +using EpinelPS.Net; +using EpinelPS.Utils; using System; using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; -namespace nksrv.LobbyServer.Msgs.Intercept +namespace EpinelPS.LobbyServer.Msgs.Intercept { [PacketPath("/intercept/get")] public class GetInterceptData : LobbyMsgHandler diff --git a/nksrv/LobbyServer/Msgs/Intercept/InterceptCheck.cs b/EpinelPS/LobbyServer/Msgs/Intercept/InterceptCheck.cs similarity index 83% rename from nksrv/LobbyServer/Msgs/Intercept/InterceptCheck.cs rename to EpinelPS/LobbyServer/Msgs/Intercept/InterceptCheck.cs index 5384f50..bbed788 100644 --- a/nksrv/LobbyServer/Msgs/Intercept/InterceptCheck.cs +++ b/EpinelPS/LobbyServer/Msgs/Intercept/InterceptCheck.cs @@ -1,26 +1,26 @@ -using nksrv.Net; -using nksrv.Utils; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace nksrv.LobbyServer.Msgs.Intercept -{ - [PacketPath("/intercept/check")] - public class CheckClearInterceptToday : LobbyMsgHandler - { - protected override async Task HandleAsync() - { - var req = await ReadData(); - - var response = new ResCheckClearInterceptToday - { - Clear = true - }; - - await WriteDataAsync(response); - } - } -} +using EpinelPS.Net; +using EpinelPS.Utils; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace EpinelPS.LobbyServer.Msgs.Intercept +{ + [PacketPath("/intercept/check")] + public class CheckClearInterceptToday : LobbyMsgHandler + { + protected override async Task HandleAsync() + { + var req = await ReadData(); + + var response = new ResCheckClearInterceptToday + { + Clear = true + }; + + await WriteDataAsync(response); + } + } +} diff --git a/nksrv/LobbyServer/Msgs/Intercept/InterceptClear.cs b/EpinelPS/LobbyServer/Msgs/Intercept/InterceptClear.cs similarity index 85% rename from nksrv/LobbyServer/Msgs/Intercept/InterceptClear.cs rename to EpinelPS/LobbyServer/Msgs/Intercept/InterceptClear.cs index 37eb27d..f7b2371 100644 --- a/nksrv/LobbyServer/Msgs/Intercept/InterceptClear.cs +++ b/EpinelPS/LobbyServer/Msgs/Intercept/InterceptClear.cs @@ -1,29 +1,29 @@ -using nksrv.Net; -using nksrv.Utils; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace nksrv.LobbyServer.Msgs.Intercept -{ - [PacketPath("/intercept/clear")] - public class ClearInterceptData : LobbyMsgHandler - { - protected override async Task HandleAsync() - { - var req = await ReadData(); - - var response = new ResClearIntercept - { - Intercept = 1, - InterceptId = 1, - TicketCount = 5, - MaxTicketCount = 10 - }; - - await WriteDataAsync(response); - } - } -} +using EpinelPS.Net; +using EpinelPS.Utils; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace EpinelPS.LobbyServer.Msgs.Intercept +{ + [PacketPath("/intercept/clear")] + public class ClearInterceptData : LobbyMsgHandler + { + protected override async Task HandleAsync() + { + var req = await ReadData(); + + var response = new ResClearIntercept + { + Intercept = 1, + InterceptId = 1, + TicketCount = 5, + MaxTicketCount = 10 + }; + + await WriteDataAsync(response); + } + } +} diff --git a/nksrv/LobbyServer/Msgs/Intercept/InterceptEnter.cs b/EpinelPS/LobbyServer/Msgs/Intercept/InterceptEnter.cs similarity index 81% rename from nksrv/LobbyServer/Msgs/Intercept/InterceptEnter.cs rename to EpinelPS/LobbyServer/Msgs/Intercept/InterceptEnter.cs index 6c87f26..defa09e 100644 --- a/nksrv/LobbyServer/Msgs/Intercept/InterceptEnter.cs +++ b/EpinelPS/LobbyServer/Msgs/Intercept/InterceptEnter.cs @@ -1,23 +1,23 @@ -using nksrv.Net; -using nksrv.Utils; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace nksrv.LobbyServer.Msgs.Intercept -{ - [PacketPath("/intercept/enter")] - public class EnterInterceptData : LobbyMsgHandler - { - protected override async Task HandleAsync() - { - var req = await ReadData(); - - var response = new ResEnterIntercept(); - - await WriteDataAsync(response); - } - } -} +using EpinelPS.Net; +using EpinelPS.Utils; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace EpinelPS.LobbyServer.Msgs.Intercept +{ + [PacketPath("/intercept/enter")] + public class EnterInterceptData : LobbyMsgHandler + { + protected override async Task HandleAsync() + { + var req = await ReadData(); + + var response = new ResEnterIntercept(); + + await WriteDataAsync(response); + } + } +} diff --git a/nksrv/LobbyServer/Msgs/Intercept/InterceptFastClear.cs b/EpinelPS/LobbyServer/Msgs/Intercept/InterceptFastClear.cs similarity index 83% rename from nksrv/LobbyServer/Msgs/Intercept/InterceptFastClear.cs rename to EpinelPS/LobbyServer/Msgs/Intercept/InterceptFastClear.cs index 1f11676..999e8c6 100644 --- a/nksrv/LobbyServer/Msgs/Intercept/InterceptFastClear.cs +++ b/EpinelPS/LobbyServer/Msgs/Intercept/InterceptFastClear.cs @@ -1,25 +1,25 @@ -using nksrv.Net; -using nksrv.Utils; -using System.Threading.Tasks; - -namespace nksrv.LobbyServer.Msgs.Intercept -{ - [PacketPath("/intercept/fastclear")] - public class FastClearInterceptData : LobbyMsgHandler - { - protected override async Task HandleAsync() - { - var req = await ReadData(); - - var response = new ResFastClearIntercept - { - Intercept = 1, - InterceptId = 1, - TicketCount = 3, - MaxTicketCount = 10 - }; - - await WriteDataAsync(response); - } - } -} +using EpinelPS.Net; +using EpinelPS.Utils; +using System.Threading.Tasks; + +namespace EpinelPS.LobbyServer.Msgs.Intercept +{ + [PacketPath("/intercept/fastclear")] + public class FastClearInterceptData : LobbyMsgHandler + { + protected override async Task HandleAsync() + { + var req = await ReadData(); + + var response = new ResFastClearIntercept + { + Intercept = 1, + InterceptId = 1, + TicketCount = 3, + MaxTicketCount = 10 + }; + + await WriteDataAsync(response); + } + } +} diff --git a/nksrv/LobbyServer/Msgs/Inventory/ClearAllEquipment.cs b/EpinelPS/LobbyServer/Msgs/Inventory/ClearAllEquipment.cs similarity index 88% rename from nksrv/LobbyServer/Msgs/Inventory/ClearAllEquipment.cs rename to EpinelPS/LobbyServer/Msgs/Inventory/ClearAllEquipment.cs index a52eebe..ba6ff95 100644 --- a/nksrv/LobbyServer/Msgs/Inventory/ClearAllEquipment.cs +++ b/EpinelPS/LobbyServer/Msgs/Inventory/ClearAllEquipment.cs @@ -1,7 +1,7 @@ -using nksrv.Database; -using nksrv.Utils; +using EpinelPS.Database; +using EpinelPS.Utils; -namespace nksrv.LobbyServer.Msgs.Inventory +namespace EpinelPS.LobbyServer.Msgs.Inventory { [PacketPath("/inventory/allclearequipment")] public class ClearAllEquipment : LobbyMsgHandler diff --git a/nksrv/LobbyServer/Msgs/Inventory/ClearEquipment.cs b/EpinelPS/LobbyServer/Msgs/Inventory/ClearEquipment.cs similarity index 88% rename from nksrv/LobbyServer/Msgs/Inventory/ClearEquipment.cs rename to EpinelPS/LobbyServer/Msgs/Inventory/ClearEquipment.cs index 5ba4b56..39debaa 100644 --- a/nksrv/LobbyServer/Msgs/Inventory/ClearEquipment.cs +++ b/EpinelPS/LobbyServer/Msgs/Inventory/ClearEquipment.cs @@ -1,7 +1,7 @@ -using nksrv.Database; -using nksrv.Utils; +using EpinelPS.Database; +using EpinelPS.Utils; -namespace nksrv.LobbyServer.Msgs.Inventory +namespace EpinelPS.LobbyServer.Msgs.Inventory { [PacketPath("/inventory/clearequipment")] public class ClearEquipment : LobbyMsgHandler diff --git a/nksrv/LobbyServer/Msgs/Inventory/GetInventoryData.cs b/EpinelPS/LobbyServer/Msgs/Inventory/GetInventoryData.cs similarity index 91% rename from nksrv/LobbyServer/Msgs/Inventory/GetInventoryData.cs rename to EpinelPS/LobbyServer/Msgs/Inventory/GetInventoryData.cs index 660c19b..2f69836 100644 --- a/nksrv/LobbyServer/Msgs/Inventory/GetInventoryData.cs +++ b/EpinelPS/LobbyServer/Msgs/Inventory/GetInventoryData.cs @@ -1,6 +1,6 @@ -using nksrv.Utils; +using EpinelPS.Utils; -namespace nksrv.LobbyServer.Msgs.Inventory +namespace EpinelPS.LobbyServer.Msgs.Inventory { [PacketPath("/inventory/get")] public class GetInventoryData : LobbyMsgHandler diff --git a/nksrv/LobbyServer/Msgs/Inventory/WearEquipment.cs b/EpinelPS/LobbyServer/Msgs/Inventory/WearEquipment.cs similarity index 91% rename from nksrv/LobbyServer/Msgs/Inventory/WearEquipment.cs rename to EpinelPS/LobbyServer/Msgs/Inventory/WearEquipment.cs index f0daf0f..fd0bb5f 100644 --- a/nksrv/LobbyServer/Msgs/Inventory/WearEquipment.cs +++ b/EpinelPS/LobbyServer/Msgs/Inventory/WearEquipment.cs @@ -1,7 +1,7 @@ -using nksrv.Database; -using nksrv.Utils; +using EpinelPS.Database; +using EpinelPS.Utils; -namespace nksrv.LobbyServer.Msgs.Inventory +namespace EpinelPS.LobbyServer.Msgs.Inventory { [PacketPath("/inventory/wearequipment")] public class WearEquipment : LobbyMsgHandler diff --git a/nksrv/LobbyServer/Msgs/Inventory/WearEquipmentList.cs b/EpinelPS/LobbyServer/Msgs/Inventory/WearEquipmentList.cs similarity index 92% rename from nksrv/LobbyServer/Msgs/Inventory/WearEquipmentList.cs rename to EpinelPS/LobbyServer/Msgs/Inventory/WearEquipmentList.cs index b062542..4899e6e 100644 --- a/nksrv/LobbyServer/Msgs/Inventory/WearEquipmentList.cs +++ b/EpinelPS/LobbyServer/Msgs/Inventory/WearEquipmentList.cs @@ -1,7 +1,7 @@ -using nksrv.Database; -using nksrv.Utils; +using EpinelPS.Database; +using EpinelPS.Utils; -namespace nksrv.LobbyServer.Msgs.Inventory +namespace EpinelPS.LobbyServer.Msgs.Inventory { [PacketPath("/inventory/wearequipmentlist")] public class WearEquipmentList : LobbyMsgHandler diff --git a/nksrv/LobbyServer/Msgs/Liberate/ChooseCharacter.cs b/EpinelPS/LobbyServer/Msgs/Liberate/ChooseCharacter.cs similarity index 91% rename from nksrv/LobbyServer/Msgs/Liberate/ChooseCharacter.cs rename to EpinelPS/LobbyServer/Msgs/Liberate/ChooseCharacter.cs index 552b8b4..9a6d30a 100644 --- a/nksrv/LobbyServer/Msgs/Liberate/ChooseCharacter.cs +++ b/EpinelPS/LobbyServer/Msgs/Liberate/ChooseCharacter.cs @@ -1,12 +1,12 @@ -using nksrv.Net; -using nksrv.Utils; +using EpinelPS.Net; +using EpinelPS.Utils; using System; using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; -namespace nksrv.LobbyServer.Msgs.Liberate +namespace EpinelPS.LobbyServer.Msgs.Liberate { [PacketPath("/liberate/choosecharacter")] public class ChooseCharacter : LobbyMsgHandler diff --git a/nksrv/LobbyServer/Msgs/Liberate/GetLiberateData.cs b/EpinelPS/LobbyServer/Msgs/Liberate/GetLiberateData.cs similarity index 84% rename from nksrv/LobbyServer/Msgs/Liberate/GetLiberateData.cs rename to EpinelPS/LobbyServer/Msgs/Liberate/GetLiberateData.cs index b1bced8..7a322ec 100644 --- a/nksrv/LobbyServer/Msgs/Liberate/GetLiberateData.cs +++ b/EpinelPS/LobbyServer/Msgs/Liberate/GetLiberateData.cs @@ -1,6 +1,6 @@ -using nksrv.Utils; +using EpinelPS.Utils; -namespace nksrv.LobbyServer.Msgs.Liberate +namespace EpinelPS.LobbyServer.Msgs.Liberate { [PacketPath("/liberate/get")] public class GetLiberateData : LobbyMsgHandler diff --git a/nksrv/LobbyServer/Msgs/Liberate/GetProgressList.cs b/EpinelPS/LobbyServer/Msgs/Liberate/GetProgressList.cs similarity index 85% rename from nksrv/LobbyServer/Msgs/Liberate/GetProgressList.cs rename to EpinelPS/LobbyServer/Msgs/Liberate/GetProgressList.cs index 63f9877..b2c9976 100644 --- a/nksrv/LobbyServer/Msgs/Liberate/GetProgressList.cs +++ b/EpinelPS/LobbyServer/Msgs/Liberate/GetProgressList.cs @@ -1,12 +1,12 @@ -using nksrv.Net; -using nksrv.Utils; +using EpinelPS.Net; +using EpinelPS.Utils; using System; using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; -namespace nksrv.LobbyServer.Msgs.Liberate +namespace EpinelPS.LobbyServer.Msgs.Liberate { [PacketPath("/liberate/getprogresslist")] public class GetProgressList : LobbyMsgHandler diff --git a/nksrv/LobbyServer/Msgs/Lostsector/GetLostSectorData.cs b/EpinelPS/LobbyServer/Msgs/Lostsector/GetLostSectorData.cs similarity index 84% rename from nksrv/LobbyServer/Msgs/Lostsector/GetLostSectorData.cs rename to EpinelPS/LobbyServer/Msgs/Lostsector/GetLostSectorData.cs index ec062b9..9d85c90 100644 --- a/nksrv/LobbyServer/Msgs/Lostsector/GetLostSectorData.cs +++ b/EpinelPS/LobbyServer/Msgs/Lostsector/GetLostSectorData.cs @@ -1,6 +1,6 @@ -using nksrv.Utils; +using EpinelPS.Utils; -namespace nksrv.LobbyServer.Msgs.Lostsector +namespace EpinelPS.LobbyServer.Msgs.Lostsector { [PacketPath("/lostsector/get")] public class GetLostSectorData : LobbyMsgHandler diff --git a/nksrv/LobbyServer/Msgs/Messenger/GetDailyMessage.cs b/EpinelPS/LobbyServer/Msgs/Messenger/GetDailyMessage.cs similarity index 84% rename from nksrv/LobbyServer/Msgs/Messenger/GetDailyMessage.cs rename to EpinelPS/LobbyServer/Msgs/Messenger/GetDailyMessage.cs index e7cad7e..c0f6a88 100644 --- a/nksrv/LobbyServer/Msgs/Messenger/GetDailyMessage.cs +++ b/EpinelPS/LobbyServer/Msgs/Messenger/GetDailyMessage.cs @@ -1,6 +1,6 @@ -using nksrv.Utils; +using EpinelPS.Utils; -namespace nksrv.LobbyServer.Msgs.Messenger +namespace EpinelPS.LobbyServer.Msgs.Messenger { [PacketPath("/messenger/daily/pick")] public class GetDailyMessage : LobbyMsgHandler diff --git a/nksrv/LobbyServer/Msgs/Messenger/GetMessages.cs b/EpinelPS/LobbyServer/Msgs/Messenger/GetMessages.cs similarity index 83% rename from nksrv/LobbyServer/Msgs/Messenger/GetMessages.cs rename to EpinelPS/LobbyServer/Msgs/Messenger/GetMessages.cs index a2efb43..8558d4b 100644 --- a/nksrv/LobbyServer/Msgs/Messenger/GetMessages.cs +++ b/EpinelPS/LobbyServer/Msgs/Messenger/GetMessages.cs @@ -1,6 +1,6 @@ -using nksrv.Utils; +using EpinelPS.Utils; -namespace nksrv.LobbyServer.Msgs.Messenger +namespace EpinelPS.LobbyServer.Msgs.Messenger { [PacketPath("/messenger/get")] public class GetMessages : LobbyMsgHandler diff --git a/nksrv/LobbyServer/Msgs/Messenger/GetPickedMessage.cs b/EpinelPS/LobbyServer/Msgs/Messenger/GetPickedMessage.cs similarity index 84% rename from nksrv/LobbyServer/Msgs/Messenger/GetPickedMessage.cs rename to EpinelPS/LobbyServer/Msgs/Messenger/GetPickedMessage.cs index 3442936..67aa1d1 100644 --- a/nksrv/LobbyServer/Msgs/Messenger/GetPickedMessage.cs +++ b/EpinelPS/LobbyServer/Msgs/Messenger/GetPickedMessage.cs @@ -1,6 +1,6 @@ -using nksrv.Utils; +using EpinelPS.Utils; -namespace nksrv.LobbyServer.Msgs.Messenger +namespace EpinelPS.LobbyServer.Msgs.Messenger { [PacketPath("/messenger/picked/get")] public class GetPickedMessage : LobbyMsgHandler diff --git a/nksrv/LobbyServer/Msgs/Messenger/GetRandomPick.cs b/EpinelPS/LobbyServer/Msgs/Messenger/GetRandomPick.cs similarity index 85% rename from nksrv/LobbyServer/Msgs/Messenger/GetRandomPick.cs rename to EpinelPS/LobbyServer/Msgs/Messenger/GetRandomPick.cs index ec63563..7e56fe3 100644 --- a/nksrv/LobbyServer/Msgs/Messenger/GetRandomPick.cs +++ b/EpinelPS/LobbyServer/Msgs/Messenger/GetRandomPick.cs @@ -1,6 +1,6 @@ -using nksrv.Utils; +using EpinelPS.Utils; -namespace nksrv.LobbyServer.Msgs.Messenger +namespace EpinelPS.LobbyServer.Msgs.Messenger { [PacketPath("/messenger/random/pick")] public class GetRandomPick : LobbyMsgHandler diff --git a/nksrv/LobbyServer/Msgs/Messenger/ProceedMsg.cs b/EpinelPS/LobbyServer/Msgs/Messenger/ProceedMsg.cs similarity index 83% rename from nksrv/LobbyServer/Msgs/Messenger/ProceedMsg.cs rename to EpinelPS/LobbyServer/Msgs/Messenger/ProceedMsg.cs index 3578c4e..ca44ada 100644 --- a/nksrv/LobbyServer/Msgs/Messenger/ProceedMsg.cs +++ b/EpinelPS/LobbyServer/Msgs/Messenger/ProceedMsg.cs @@ -1,6 +1,6 @@ -using nksrv.Utils; +using EpinelPS.Utils; -namespace nksrv.LobbyServer.Msgs.Messenger +namespace EpinelPS.LobbyServer.Msgs.Messenger { [PacketPath("/messenger/proceed")] public class ProceedMsg : LobbyMsgHandler diff --git a/nksrv/LobbyServer/Msgs/Minigame/Dave/GetAllDaveTrigger.cs b/EpinelPS/LobbyServer/Msgs/Minigame/Dave/GetAllDaveTrigger.cs similarity index 84% rename from nksrv/LobbyServer/Msgs/Minigame/Dave/GetAllDaveTrigger.cs rename to EpinelPS/LobbyServer/Msgs/Minigame/Dave/GetAllDaveTrigger.cs index 5dd47da..d9c8c84 100644 --- a/nksrv/LobbyServer/Msgs/Minigame/Dave/GetAllDaveTrigger.cs +++ b/EpinelPS/LobbyServer/Msgs/Minigame/Dave/GetAllDaveTrigger.cs @@ -1,6 +1,6 @@ -using nksrv.Utils; +using EpinelPS.Utils; -namespace nksrv.LobbyServer.Msgs.Minigame.Dave +namespace EpinelPS.LobbyServer.Msgs.Minigame.Dave { [PacketPath("/event/minigame/dave/getalldavetrigger")] public class GetAllDaveTrigger : LobbyMsgHandler diff --git a/nksrv/LobbyServer/Msgs/Minigame/GetNksv2Minigame.cs b/EpinelPS/LobbyServer/Msgs/Minigame/GetNksv2Minigame.cs similarity index 84% rename from nksrv/LobbyServer/Msgs/Minigame/GetNksv2Minigame.cs rename to EpinelPS/LobbyServer/Msgs/Minigame/GetNksv2Minigame.cs index 425e3b6..a2935a3 100644 --- a/nksrv/LobbyServer/Msgs/Minigame/GetNksv2Minigame.cs +++ b/EpinelPS/LobbyServer/Msgs/Minigame/GetNksv2Minigame.cs @@ -1,6 +1,6 @@ -using nksrv.Utils; +using EpinelPS.Utils; -namespace nksrv.LobbyServer.Msgs.Minigame +namespace EpinelPS.LobbyServer.Msgs.Minigame { [PacketPath("/minigame/nksv2/get")] public class GetNksv2Minigame : LobbyMsgHandler diff --git a/nksrv/LobbyServer/Msgs/Minigame/IslandAdventure/GetFishingStepUpRewardStatus.cs b/EpinelPS/LobbyServer/Msgs/Minigame/IslandAdventure/GetFishingStepUpRewardStatus.cs similarity index 84% rename from nksrv/LobbyServer/Msgs/Minigame/IslandAdventure/GetFishingStepUpRewardStatus.cs rename to EpinelPS/LobbyServer/Msgs/Minigame/IslandAdventure/GetFishingStepUpRewardStatus.cs index d2b65a2..e68311d 100644 --- a/nksrv/LobbyServer/Msgs/Minigame/IslandAdventure/GetFishingStepUpRewardStatus.cs +++ b/EpinelPS/LobbyServer/Msgs/Minigame/IslandAdventure/GetFishingStepUpRewardStatus.cs @@ -1,6 +1,6 @@ -using nksrv.Utils; +using EpinelPS.Utils; -namespace nksrv.LobbyServer.Msgs.Minigame.IslandAdventure +namespace EpinelPS.LobbyServer.Msgs.Minigame.IslandAdventure { [PacketPath("/event/minigame/islandadventure/get/fishing/stepupreward")] public class GetFishingStepUpRewardStatus : LobbyMsgHandler diff --git a/nksrv/LobbyServer/Msgs/Minigame/IslandAdventure/GetPhotoStepUpRewardStatus.cs b/EpinelPS/LobbyServer/Msgs/Minigame/IslandAdventure/GetPhotoStepUpRewardStatus.cs similarity index 84% rename from nksrv/LobbyServer/Msgs/Minigame/IslandAdventure/GetPhotoStepUpRewardStatus.cs rename to EpinelPS/LobbyServer/Msgs/Minigame/IslandAdventure/GetPhotoStepUpRewardStatus.cs index a74b1f6..a3d5a7c 100644 --- a/nksrv/LobbyServer/Msgs/Minigame/IslandAdventure/GetPhotoStepUpRewardStatus.cs +++ b/EpinelPS/LobbyServer/Msgs/Minigame/IslandAdventure/GetPhotoStepUpRewardStatus.cs @@ -1,6 +1,6 @@ -using nksrv.Utils; +using EpinelPS.Utils; -namespace nksrv.LobbyServer.Msgs.Minigame.IslandAdventure +namespace EpinelPS.LobbyServer.Msgs.Minigame.IslandAdventure { [PacketPath("/event/minigame/islandadventure/get/photo/stepupreward")] public class GetPhotoStepUpRewardStatus : LobbyMsgHandler diff --git a/nksrv/LobbyServer/Msgs/Minigame/IslandAdventure/ListMission.cs b/EpinelPS/LobbyServer/Msgs/Minigame/IslandAdventure/ListMission.cs similarity index 82% rename from nksrv/LobbyServer/Msgs/Minigame/IslandAdventure/ListMission.cs rename to EpinelPS/LobbyServer/Msgs/Minigame/IslandAdventure/ListMission.cs index 6cc9f15..d0d5411 100644 --- a/nksrv/LobbyServer/Msgs/Minigame/IslandAdventure/ListMission.cs +++ b/EpinelPS/LobbyServer/Msgs/Minigame/IslandAdventure/ListMission.cs @@ -1,6 +1,6 @@ -using nksrv.Utils; +using EpinelPS.Utils; -namespace nksrv.LobbyServer.Msgs.Minigame.IslandAdventure +namespace EpinelPS.LobbyServer.Msgs.Minigame.IslandAdventure { [PacketPath("/event/minigame/islandadventure/list/mission")] public class ListMission : LobbyMsgHandler diff --git a/nksrv/LobbyServer/Msgs/Minigame/PlaySoda/GetChallengeInfo.cs b/EpinelPS/LobbyServer/Msgs/Minigame/PlaySoda/GetChallengeInfo.cs similarity index 83% rename from nksrv/LobbyServer/Msgs/Minigame/PlaySoda/GetChallengeInfo.cs rename to EpinelPS/LobbyServer/Msgs/Minigame/PlaySoda/GetChallengeInfo.cs index 790240e..3979bc2 100644 --- a/nksrv/LobbyServer/Msgs/Minigame/PlaySoda/GetChallengeInfo.cs +++ b/EpinelPS/LobbyServer/Msgs/Minigame/PlaySoda/GetChallengeInfo.cs @@ -1,6 +1,6 @@ -using nksrv.Utils; +using EpinelPS.Utils; -namespace nksrv.LobbyServer.Msgs.Minigame.PlaySoda +namespace EpinelPS.LobbyServer.Msgs.Minigame.PlaySoda { [PacketPath("/event/minigame/playsoda/challenge/getinfo")] public class GetChallengeInfo : LobbyMsgHandler diff --git a/nksrv/LobbyServer/Msgs/Misc/EnterLobbyPing.cs b/EpinelPS/LobbyServer/Msgs/Misc/EnterLobbyPing.cs similarity index 83% rename from nksrv/LobbyServer/Msgs/Misc/EnterLobbyPing.cs rename to EpinelPS/LobbyServer/Msgs/Misc/EnterLobbyPing.cs index 397d04f..fb24a67 100644 --- a/nksrv/LobbyServer/Msgs/Misc/EnterLobbyPing.cs +++ b/EpinelPS/LobbyServer/Msgs/Misc/EnterLobbyPing.cs @@ -1,6 +1,6 @@ -using nksrv.Utils; +using EpinelPS.Utils; -namespace nksrv.LobbyServer.Msgs.Misc +namespace EpinelPS.LobbyServer.Msgs.Misc { [PacketPath("/enterlobbyping")] public class EnterLobbyPing : LobbyMsgHandler diff --git a/nksrv/LobbyServer/Msgs/Misc/GachaGetAllShutdownFlags.cs b/EpinelPS/LobbyServer/Msgs/Misc/GachaGetAllShutdownFlags.cs similarity index 89% rename from nksrv/LobbyServer/Msgs/Misc/GachaGetAllShutdownFlags.cs rename to EpinelPS/LobbyServer/Msgs/Misc/GachaGetAllShutdownFlags.cs index 19d7ce6..b26234d 100644 --- a/nksrv/LobbyServer/Msgs/Misc/GachaGetAllShutdownFlags.cs +++ b/EpinelPS/LobbyServer/Msgs/Misc/GachaGetAllShutdownFlags.cs @@ -1,6 +1,6 @@ -using nksrv.Utils; +using EpinelPS.Utils; -namespace nksrv.LobbyServer.Msgs.Misc +namespace EpinelPS.LobbyServer.Msgs.Misc { [PacketPath("/shutdownflags/gacha/getall")] public class GachaGetAllShutdownFlags : LobbyMsgHandler diff --git a/nksrv/LobbyServer/Msgs/Misc/GetFeatureFlags.cs b/EpinelPS/LobbyServer/Msgs/Misc/GetFeatureFlags.cs similarity index 84% rename from nksrv/LobbyServer/Msgs/Misc/GetFeatureFlags.cs rename to EpinelPS/LobbyServer/Msgs/Misc/GetFeatureFlags.cs index ae63cd6..fb50e94 100644 --- a/nksrv/LobbyServer/Msgs/Misc/GetFeatureFlags.cs +++ b/EpinelPS/LobbyServer/Msgs/Misc/GetFeatureFlags.cs @@ -1,6 +1,6 @@ -using nksrv.Utils; +using EpinelPS.Utils; -namespace nksrv.LobbyServer.Msgs.Misc +namespace EpinelPS.LobbyServer.Msgs.Misc { [PacketPath("/featureflags/get")] public class GetFeatureFlags : LobbyMsgHandler diff --git a/nksrv/LobbyServer/Msgs/Misc/GetMaintenanceNotice.cs b/EpinelPS/LobbyServer/Msgs/Misc/GetMaintenanceNotice.cs similarity index 76% rename from nksrv/LobbyServer/Msgs/Misc/GetMaintenanceNotice.cs rename to EpinelPS/LobbyServer/Msgs/Misc/GetMaintenanceNotice.cs index 9c73e46..7eeb683 100644 --- a/nksrv/LobbyServer/Msgs/Misc/GetMaintenanceNotice.cs +++ b/EpinelPS/LobbyServer/Msgs/Misc/GetMaintenanceNotice.cs @@ -1,7 +1,7 @@ -using nksrv.Net; -using nksrv.Utils; +using EpinelPS.Net; +using EpinelPS.Utils; -namespace nksrv.LobbyServer.Msgs.Misc +namespace EpinelPS.LobbyServer.Msgs.Misc { [PacketPath("/maintenancenotice")] public class GetMaintenanceNotice : LobbyMsgHandler diff --git a/nksrv/LobbyServer/Msgs/Misc/GetResourceHosts2.cs b/EpinelPS/LobbyServer/Msgs/Misc/GetResourceHosts2.cs similarity index 81% rename from nksrv/LobbyServer/Msgs/Misc/GetResourceHosts2.cs rename to EpinelPS/LobbyServer/Msgs/Misc/GetResourceHosts2.cs index 69571d7..eb01990 100644 --- a/nksrv/LobbyServer/Msgs/Misc/GetResourceHosts2.cs +++ b/EpinelPS/LobbyServer/Msgs/Misc/GetResourceHosts2.cs @@ -1,7 +1,7 @@ -using nksrv.Net; -using nksrv.Utils; +using EpinelPS.Net; +using EpinelPS.Utils; -namespace nksrv.LobbyServer.Msgs.Misc +namespace EpinelPS.LobbyServer.Msgs.Misc { [PacketPath("/resourcehosts2")] public class CheckClientVersion : LobbyMsgHandler diff --git a/nksrv/LobbyServer/Msgs/Misc/GetSentryParams.cs b/EpinelPS/LobbyServer/Msgs/Misc/GetSentryParams.cs similarity index 81% rename from nksrv/LobbyServer/Msgs/Misc/GetSentryParams.cs rename to EpinelPS/LobbyServer/Msgs/Misc/GetSentryParams.cs index b96d632..15a3f90 100644 --- a/nksrv/LobbyServer/Msgs/Misc/GetSentryParams.cs +++ b/EpinelPS/LobbyServer/Msgs/Misc/GetSentryParams.cs @@ -1,7 +1,7 @@ -using nksrv.Net; -using nksrv.Utils; +using EpinelPS.Net; +using EpinelPS.Utils; -namespace nksrv.LobbyServer.Msgs.Misc +namespace EpinelPS.LobbyServer.Msgs.Misc { [PacketPath("/system/sentry/getparams")] public class GetSentryParams : LobbyMsgHandler diff --git a/nksrv/LobbyServer/Msgs/Misc/GetServerInfo.cs b/EpinelPS/LobbyServer/Msgs/Misc/GetServerInfo.cs similarity index 82% rename from nksrv/LobbyServer/Msgs/Misc/GetServerInfo.cs rename to EpinelPS/LobbyServer/Msgs/Misc/GetServerInfo.cs index a4a3d5b..67fa597 100644 --- a/nksrv/LobbyServer/Msgs/Misc/GetServerInfo.cs +++ b/EpinelPS/LobbyServer/Msgs/Misc/GetServerInfo.cs @@ -1,7 +1,7 @@ -using nksrv.Net; -using nksrv.Utils; +using EpinelPS.Net; +using EpinelPS.Utils; -namespace nksrv.LobbyServer.Msgs.Misc +namespace EpinelPS.LobbyServer.Msgs.Misc { [PacketPath("/getserverinfo")] public class GetServerInfo : LobbyMsgHandler diff --git a/nksrv/LobbyServer/Msgs/Misc/GetStaticDataPack.cs b/EpinelPS/LobbyServer/Msgs/Misc/GetStaticDataPack.cs similarity index 73% rename from nksrv/LobbyServer/Msgs/Misc/GetStaticDataPack.cs rename to EpinelPS/LobbyServer/Msgs/Misc/GetStaticDataPack.cs index b1e2c88..29a2566 100644 --- a/nksrv/LobbyServer/Msgs/Misc/GetStaticDataPack.cs +++ b/EpinelPS/LobbyServer/Msgs/Misc/GetStaticDataPack.cs @@ -1,9 +1,9 @@ using Google.Protobuf; -using nksrv.Net; -using nksrv.StaticInfo; -using nksrv.Utils; +using EpinelPS.Net; +using EpinelPS.StaticInfo; +using EpinelPS.Utils; -namespace nksrv.LobbyServer.Msgs.Misc +namespace EpinelPS.LobbyServer.Msgs.Misc { [PacketPath("/staticdatapack")] public class GetStaticDataPack : LobbyMsgHandler @@ -15,8 +15,8 @@ namespace nksrv.LobbyServer.Msgs.Misc var r = new StaticDataPackResponse(); r.Url = GameConfig.Root.StaticData.Url; r.Version = GameConfig.Root.StaticData.Version; - r.FileSize = StaticDataParser.Instance.Size; - r.Sha256Sum = ByteString.CopyFrom(StaticDataParser.Instance.Sha256Hash); + r.FileSize = GameData.Instance.Size; + r.Sha256Sum = ByteString.CopyFrom(GameData.Instance.Sha256Hash); r.Salt1 = ByteString.CopyFrom(Convert.FromBase64String(GameConfig.Root.StaticData.Salt1)); r.Salt2 = ByteString.CopyFrom(Convert.FromBase64String(GameConfig.Root.StaticData.Salt2)); diff --git a/nksrv/LobbyServer/Msgs/Misc/GetUserOnlineStateLog.cs b/EpinelPS/LobbyServer/Msgs/Misc/GetUserOnlineStateLog.cs similarity index 86% rename from nksrv/LobbyServer/Msgs/Misc/GetUserOnlineStateLog.cs rename to EpinelPS/LobbyServer/Msgs/Misc/GetUserOnlineStateLog.cs index cc691ca..0c97975 100644 --- a/nksrv/LobbyServer/Msgs/Misc/GetUserOnlineStateLog.cs +++ b/EpinelPS/LobbyServer/Msgs/Misc/GetUserOnlineStateLog.cs @@ -1,6 +1,6 @@ -using nksrv.Utils; +using EpinelPS.Utils; -namespace nksrv.LobbyServer.Msgs.Misc +namespace EpinelPS.LobbyServer.Msgs.Misc { [PacketPath("/useronlinestatelog")] public class GetUserOnlineStateLog : LobbyMsgHandler diff --git a/nksrv/LobbyServer/Msgs/Mission/GetAchievementRewardedData.cs b/EpinelPS/LobbyServer/Msgs/Mission/GetAchievementRewardedData.cs similarity index 85% rename from nksrv/LobbyServer/Msgs/Mission/GetAchievementRewardedData.cs rename to EpinelPS/LobbyServer/Msgs/Mission/GetAchievementRewardedData.cs index 8033d36..b3c053f 100644 --- a/nksrv/LobbyServer/Msgs/Mission/GetAchievementRewardedData.cs +++ b/EpinelPS/LobbyServer/Msgs/Mission/GetAchievementRewardedData.cs @@ -1,6 +1,6 @@ -using nksrv.Utils; +using EpinelPS.Utils; -namespace nksrv.LobbyServer.Msgs.Mission +namespace EpinelPS.LobbyServer.Msgs.Mission { [PacketPath("/mission/getrewarded/achievement")] public class GetAchievementRewardedData : LobbyMsgHandler diff --git a/nksrv/LobbyServer/Msgs/Mission/Rewards/GetDailyRewards.cs b/EpinelPS/LobbyServer/Msgs/Mission/Rewards/GetDailyRewards.cs similarity index 83% rename from nksrv/LobbyServer/Msgs/Mission/Rewards/GetDailyRewards.cs rename to EpinelPS/LobbyServer/Msgs/Mission/Rewards/GetDailyRewards.cs index 9c42557..52294e5 100644 --- a/nksrv/LobbyServer/Msgs/Mission/Rewards/GetDailyRewards.cs +++ b/EpinelPS/LobbyServer/Msgs/Mission/Rewards/GetDailyRewards.cs @@ -1,6 +1,6 @@ -using nksrv.Utils; +using EpinelPS.Utils; -namespace nksrv.LobbyServer.Msgs.Mission.Rewards +namespace EpinelPS.LobbyServer.Msgs.Mission.Rewards { [PacketPath("/mission/getrewarded/daily")] public class GetDailyRewards : LobbyMsgHandler diff --git a/nksrv/LobbyServer/Msgs/Mission/Rewards/GetJukeboxRewards.cs b/EpinelPS/LobbyServer/Msgs/Mission/Rewards/GetJukeboxRewards.cs similarity index 85% rename from nksrv/LobbyServer/Msgs/Mission/Rewards/GetJukeboxRewards.cs rename to EpinelPS/LobbyServer/Msgs/Mission/Rewards/GetJukeboxRewards.cs index 900e2cf..d252bd0 100644 --- a/nksrv/LobbyServer/Msgs/Mission/Rewards/GetJukeboxRewards.cs +++ b/EpinelPS/LobbyServer/Msgs/Mission/Rewards/GetJukeboxRewards.cs @@ -1,6 +1,6 @@ -using nksrv.Utils; +using EpinelPS.Utils; -namespace nksrv.LobbyServer.Msgs.Outpost +namespace EpinelPS.LobbyServer.Msgs.Outpost { [PacketPath("/mission/getrewarded/jukebox")] public class GetJukeboxRewards : LobbyMsgHandler diff --git a/nksrv/LobbyServer/Msgs/Mission/Rewards/GetWeeklyRewards.cs b/EpinelPS/LobbyServer/Msgs/Mission/Rewards/GetWeeklyRewards.cs similarity index 83% rename from nksrv/LobbyServer/Msgs/Mission/Rewards/GetWeeklyRewards.cs rename to EpinelPS/LobbyServer/Msgs/Mission/Rewards/GetWeeklyRewards.cs index 147ce56..e46be81 100644 --- a/nksrv/LobbyServer/Msgs/Mission/Rewards/GetWeeklyRewards.cs +++ b/EpinelPS/LobbyServer/Msgs/Mission/Rewards/GetWeeklyRewards.cs @@ -1,6 +1,6 @@ -using nksrv.Utils; +using EpinelPS.Utils; -namespace nksrv.LobbyServer.Msgs.Mission.Rewards +namespace EpinelPS.LobbyServer.Msgs.Mission.Rewards { [PacketPath("/mission/getrewarded/weekly")] public class GetWeeklyRewards : LobbyMsgHandler diff --git a/nksrv/LobbyServer/Msgs/Outpost/CheckInfracore.cs b/EpinelPS/LobbyServer/Msgs/Outpost/CheckInfracore.cs similarity index 84% rename from nksrv/LobbyServer/Msgs/Outpost/CheckInfracore.cs rename to EpinelPS/LobbyServer/Msgs/Outpost/CheckInfracore.cs index 8e13c13..102386a 100644 --- a/nksrv/LobbyServer/Msgs/Outpost/CheckInfracore.cs +++ b/EpinelPS/LobbyServer/Msgs/Outpost/CheckInfracore.cs @@ -1,6 +1,6 @@ -using nksrv.Utils; +using EpinelPS.Utils; -namespace nksrv.LobbyServer.Msgs.Outpost +namespace EpinelPS.LobbyServer.Msgs.Outpost { [PacketPath("/infracore/check")] public class CheckInfracore : LobbyMsgHandler diff --git a/nksrv/LobbyServer/Msgs/Outpost/ClearTacticAcademyLesson.cs b/EpinelPS/LobbyServer/Msgs/Outpost/ClearTacticAcademyLesson.cs similarity index 85% rename from nksrv/LobbyServer/Msgs/Outpost/ClearTacticAcademyLesson.cs rename to EpinelPS/LobbyServer/Msgs/Outpost/ClearTacticAcademyLesson.cs index 244a1b3..69c4471 100644 --- a/nksrv/LobbyServer/Msgs/Outpost/ClearTacticAcademyLesson.cs +++ b/EpinelPS/LobbyServer/Msgs/Outpost/ClearTacticAcademyLesson.cs @@ -1,9 +1,9 @@ -using nksrv.Net; -using nksrv.StaticInfo; -using nksrv.Utils; +using EpinelPS.Net; +using EpinelPS.StaticInfo; +using EpinelPS.Utils; using Swan.Logging; -namespace nksrv.LobbyServer.Msgs.Outpost +namespace EpinelPS.LobbyServer.Msgs.Outpost { [PacketPath("/outpost/tactic/clearlesson")] public class ClearTacticAcademyLesson : LobbyMsgHandler @@ -16,7 +16,7 @@ namespace nksrv.LobbyServer.Msgs.Outpost var response = new TacticAcademyClearLessonResponse(); response.LessonId = req.LessonId; - var x = StaticDataParser.Instance.GetTacticAcademyLesson(req.LessonId); + var x = GameData.Instance.GetTacticAcademyLesson(req.LessonId); if (user.CanSubtractCurrency(x.CurrencyId, x.CurrencyValue)) { diff --git a/nksrv/LobbyServer/Msgs/Outpost/DoWipeout.cs b/EpinelPS/LobbyServer/Msgs/Outpost/DoWipeout.cs similarity index 80% rename from nksrv/LobbyServer/Msgs/Outpost/DoWipeout.cs rename to EpinelPS/LobbyServer/Msgs/Outpost/DoWipeout.cs index 0911553..0bc8023 100644 --- a/nksrv/LobbyServer/Msgs/Outpost/DoWipeout.cs +++ b/EpinelPS/LobbyServer/Msgs/Outpost/DoWipeout.cs @@ -1,7 +1,7 @@ -using nksrv.Net; -using nksrv.Utils; +using EpinelPS.Net; +using EpinelPS.Utils; -namespace nksrv.LobbyServer.Msgs.Outpost +namespace EpinelPS.LobbyServer.Msgs.Outpost { [PacketPath("/outpost/obtainfastbattlereward")] public class DoWipeout : LobbyMsgHandler diff --git a/nksrv/LobbyServer/Msgs/Outpost/GetDispatchList.cs b/EpinelPS/LobbyServer/Msgs/Outpost/GetDispatchList.cs similarity index 83% rename from nksrv/LobbyServer/Msgs/Outpost/GetDispatchList.cs rename to EpinelPS/LobbyServer/Msgs/Outpost/GetDispatchList.cs index e738160..085112a 100644 --- a/nksrv/LobbyServer/Msgs/Outpost/GetDispatchList.cs +++ b/EpinelPS/LobbyServer/Msgs/Outpost/GetDispatchList.cs @@ -1,6 +1,6 @@ -using nksrv.Utils; +using EpinelPS.Utils; -namespace nksrv.LobbyServer.Msgs.Outpost +namespace EpinelPS.LobbyServer.Msgs.Outpost { [PacketPath("/outpost/dispatch/get")] public class GetDispatchList : LobbyMsgHandler diff --git a/nksrv/LobbyServer/Msgs/Outpost/GetOutpostData.cs b/EpinelPS/LobbyServer/Msgs/Outpost/GetOutpostData.cs similarity index 97% rename from nksrv/LobbyServer/Msgs/Outpost/GetOutpostData.cs rename to EpinelPS/LobbyServer/Msgs/Outpost/GetOutpostData.cs index 0edf8b6..046a5a7 100644 --- a/nksrv/LobbyServer/Msgs/Outpost/GetOutpostData.cs +++ b/EpinelPS/LobbyServer/Msgs/Outpost/GetOutpostData.cs @@ -1,6 +1,6 @@ -using nksrv.Utils; +using EpinelPS.Utils; -namespace nksrv.LobbyServer.Msgs.Outpost +namespace EpinelPS.LobbyServer.Msgs.Outpost { [PacketPath("/outpost/getoutpostdata")] public class GetOutpostData : LobbyMsgHandler diff --git a/nksrv/LobbyServer/Msgs/Outpost/GetRecycleRoomData.cs b/EpinelPS/LobbyServer/Msgs/Outpost/GetRecycleRoomData.cs similarity index 85% rename from nksrv/LobbyServer/Msgs/Outpost/GetRecycleRoomData.cs rename to EpinelPS/LobbyServer/Msgs/Outpost/GetRecycleRoomData.cs index ba88c9c..c89f3df 100644 --- a/nksrv/LobbyServer/Msgs/Outpost/GetRecycleRoomData.cs +++ b/EpinelPS/LobbyServer/Msgs/Outpost/GetRecycleRoomData.cs @@ -1,6 +1,6 @@ -using nksrv.Utils; +using EpinelPS.Utils; -namespace nksrv.LobbyServer.Msgs.Outpost +namespace EpinelPS.LobbyServer.Msgs.Outpost { [PacketPath("/outpost/recycleroom/get")] public class GetRecycleRoomData : LobbyMsgHandler diff --git a/nksrv/LobbyServer/Msgs/Outpost/GetTacticAcademyData.cs b/EpinelPS/LobbyServer/Msgs/Outpost/GetTacticAcademyData.cs similarity index 84% rename from nksrv/LobbyServer/Msgs/Outpost/GetTacticAcademyData.cs rename to EpinelPS/LobbyServer/Msgs/Outpost/GetTacticAcademyData.cs index eaa9b1a..8bcf04e 100644 --- a/nksrv/LobbyServer/Msgs/Outpost/GetTacticAcademyData.cs +++ b/EpinelPS/LobbyServer/Msgs/Outpost/GetTacticAcademyData.cs @@ -1,7 +1,7 @@ -using nksrv.Net; -using nksrv.Utils; +using EpinelPS.Net; +using EpinelPS.Utils; -namespace nksrv.LobbyServer.Msgs.Outpost +namespace EpinelPS.LobbyServer.Msgs.Outpost { [PacketPath("/outpost/tactic/get")] public class GetTacticAcademyData : LobbyMsgHandler diff --git a/nksrv/LobbyServer/Msgs/Outpost/MemorialGetMemoryList.cs b/EpinelPS/LobbyServer/Msgs/Outpost/MemorialGetMemoryList.cs similarity index 84% rename from nksrv/LobbyServer/Msgs/Outpost/MemorialGetMemoryList.cs rename to EpinelPS/LobbyServer/Msgs/Outpost/MemorialGetMemoryList.cs index 32119a4..0933c55 100644 --- a/nksrv/LobbyServer/Msgs/Outpost/MemorialGetMemoryList.cs +++ b/EpinelPS/LobbyServer/Msgs/Outpost/MemorialGetMemoryList.cs @@ -1,6 +1,6 @@ -using nksrv.Utils; +using EpinelPS.Utils; -namespace nksrv.LobbyServer.Msgs.Outpost +namespace EpinelPS.LobbyServer.Msgs.Outpost { [PacketPath("/outpost/memorial/getmemorylist")] public class MemorialGetMemoryList : LobbyMsgHandler diff --git a/nksrv/LobbyServer/Msgs/Outpost/ShowBattleReward.cs b/EpinelPS/LobbyServer/Msgs/Outpost/ShowBattleReward.cs similarity index 93% rename from nksrv/LobbyServer/Msgs/Outpost/ShowBattleReward.cs rename to EpinelPS/LobbyServer/Msgs/Outpost/ShowBattleReward.cs index a9ac9e2..822c151 100644 --- a/nksrv/LobbyServer/Msgs/Outpost/ShowBattleReward.cs +++ b/EpinelPS/LobbyServer/Msgs/Outpost/ShowBattleReward.cs @@ -1,6 +1,6 @@ -using nksrv.Utils; +using EpinelPS.Utils; -namespace nksrv.LobbyServer.Msgs.Outpost +namespace EpinelPS.LobbyServer.Msgs.Outpost { [PacketPath("/outpost/showoutpostbattlereward")] public class ShowBattleReward : LobbyMsgHandler diff --git a/nksrv/LobbyServer/Msgs/PartyMatch/ListPartyMatchInvitations.cs b/EpinelPS/LobbyServer/Msgs/PartyMatch/ListPartyMatchInvitations.cs similarity index 84% rename from nksrv/LobbyServer/Msgs/PartyMatch/ListPartyMatchInvitations.cs rename to EpinelPS/LobbyServer/Msgs/PartyMatch/ListPartyMatchInvitations.cs index 0dfbbe4..a7fd764 100644 --- a/nksrv/LobbyServer/Msgs/PartyMatch/ListPartyMatchInvitations.cs +++ b/EpinelPS/LobbyServer/Msgs/PartyMatch/ListPartyMatchInvitations.cs @@ -1,6 +1,6 @@ -using nksrv.Utils; +using EpinelPS.Utils; -namespace nksrv.LobbyServer.Msgs.PartyMatch +namespace EpinelPS.LobbyServer.Msgs.PartyMatch { [PacketPath("/partymatch/listinvitation")] public class ListPartyMatchInvitations : LobbyMsgHandler diff --git a/nksrv/LobbyServer/Msgs/Pass/GetActiveEventPassData.cs b/EpinelPS/LobbyServer/Msgs/Pass/GetActiveEventPassData.cs similarity index 85% rename from nksrv/LobbyServer/Msgs/Pass/GetActiveEventPassData.cs rename to EpinelPS/LobbyServer/Msgs/Pass/GetActiveEventPassData.cs index 9d9b5da..2b2afe4 100644 --- a/nksrv/LobbyServer/Msgs/Pass/GetActiveEventPassData.cs +++ b/EpinelPS/LobbyServer/Msgs/Pass/GetActiveEventPassData.cs @@ -1,6 +1,6 @@ -using nksrv.Utils; +using EpinelPS.Utils; -namespace nksrv.LobbyServer.Msgs.Pass +namespace EpinelPS.LobbyServer.Msgs.Pass { [PacketPath("/pass/event/getactive")] public class GetActiveEventPassData : LobbyMsgHandler diff --git a/nksrv/LobbyServer/Msgs/Pass/GetActivePassData.cs b/EpinelPS/LobbyServer/Msgs/Pass/GetActivePassData.cs similarity index 85% rename from nksrv/LobbyServer/Msgs/Pass/GetActivePassData.cs rename to EpinelPS/LobbyServer/Msgs/Pass/GetActivePassData.cs index fd61e89..02c9a0d 100644 --- a/nksrv/LobbyServer/Msgs/Pass/GetActivePassData.cs +++ b/EpinelPS/LobbyServer/Msgs/Pass/GetActivePassData.cs @@ -1,6 +1,6 @@ -using nksrv.Utils; +using EpinelPS.Utils; -namespace nksrv.LobbyServer.Msgs.Pass +namespace EpinelPS.LobbyServer.Msgs.Pass { [PacketPath("/pass/getactive")] public class GetActivePassData : LobbyMsgHandler diff --git a/nksrv/LobbyServer/Msgs/Ranking/UpdateServerReward.cs b/EpinelPS/LobbyServer/Msgs/Ranking/UpdateServerReward.cs similarity index 84% rename from nksrv/LobbyServer/Msgs/Ranking/UpdateServerReward.cs rename to EpinelPS/LobbyServer/Msgs/Ranking/UpdateServerReward.cs index d54d816..dec5e06 100644 --- a/nksrv/LobbyServer/Msgs/Ranking/UpdateServerReward.cs +++ b/EpinelPS/LobbyServer/Msgs/Ranking/UpdateServerReward.cs @@ -1,6 +1,6 @@ -using nksrv.Utils; +using EpinelPS.Utils; -namespace nksrv.LobbyServer.Msgs.Ranking +namespace EpinelPS.LobbyServer.Msgs.Ranking { [PacketPath("/ranking/updateserverreward")] public class UpdateServerReward : LobbyMsgHandler diff --git a/nksrv/LobbyServer/Msgs/Shop/GetProductList.cs b/EpinelPS/LobbyServer/Msgs/Shop/GetProductList.cs similarity index 93% rename from nksrv/LobbyServer/Msgs/Shop/GetProductList.cs rename to EpinelPS/LobbyServer/Msgs/Shop/GetProductList.cs index 8781a7a..524753e 100644 --- a/nksrv/LobbyServer/Msgs/Shop/GetProductList.cs +++ b/EpinelPS/LobbyServer/Msgs/Shop/GetProductList.cs @@ -1,7 +1,7 @@ -using nksrv.Utils; +using EpinelPS.Utils; using Swan.Logging; -namespace nksrv.LobbyServer.Msgs.Shop +namespace EpinelPS.LobbyServer.Msgs.Shop { [PacketPath("/inappshop/jupiter/getproductlist")] public class GetProductList : LobbyMsgHandler diff --git a/nksrv/LobbyServer/Msgs/Shop/GetShop.cs b/EpinelPS/LobbyServer/Msgs/Shop/GetShop.cs similarity index 83% rename from nksrv/LobbyServer/Msgs/Shop/GetShop.cs rename to EpinelPS/LobbyServer/Msgs/Shop/GetShop.cs index d0f5782..cfcade9 100644 --- a/nksrv/LobbyServer/Msgs/Shop/GetShop.cs +++ b/EpinelPS/LobbyServer/Msgs/Shop/GetShop.cs @@ -1,12 +1,12 @@ -using nksrv.Net; -using nksrv.Utils; +using EpinelPS.Net; +using EpinelPS.Utils; using System; using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; -namespace nksrv.LobbyServer.Msgs.Shop +namespace EpinelPS.LobbyServer.Msgs.Shop { [PacketPath("/shop/get")] public class GetShop : LobbyMsgHandler diff --git a/nksrv/LobbyServer/Msgs/Shop/GetShopProductList.cs b/EpinelPS/LobbyServer/Msgs/Shop/GetShopProductList.cs similarity index 83% rename from nksrv/LobbyServer/Msgs/Shop/GetShopProductList.cs rename to EpinelPS/LobbyServer/Msgs/Shop/GetShopProductList.cs index 24e8d55..f768aba 100644 --- a/nksrv/LobbyServer/Msgs/Shop/GetShopProductList.cs +++ b/EpinelPS/LobbyServer/Msgs/Shop/GetShopProductList.cs @@ -1,6 +1,6 @@ -using nksrv.Utils; +using EpinelPS.Utils; -namespace nksrv.LobbyServer.Msgs.Shop +namespace EpinelPS.LobbyServer.Msgs.Shop { [PacketPath("/shop/productlist")] public class GetShopProductList : LobbyMsgHandler diff --git a/nksrv/LobbyServer/Msgs/Shop/InApp/GetInAppSubscription.cs b/EpinelPS/LobbyServer/Msgs/Shop/InApp/GetInAppSubscription.cs similarity index 83% rename from nksrv/LobbyServer/Msgs/Shop/InApp/GetInAppSubscription.cs rename to EpinelPS/LobbyServer/Msgs/Shop/InApp/GetInAppSubscription.cs index 2bd1a4e..c82316d 100644 --- a/nksrv/LobbyServer/Msgs/Shop/InApp/GetInAppSubscription.cs +++ b/EpinelPS/LobbyServer/Msgs/Shop/InApp/GetInAppSubscription.cs @@ -1,6 +1,6 @@ -using nksrv.Utils; +using EpinelPS.Utils; -namespace nksrv.LobbyServer.Msgs.Shop.InApp +namespace EpinelPS.LobbyServer.Msgs.Shop.InApp { [PacketPath("/inappshop/getsubscription")] public class GetInAppSubscription : LobbyMsgHandler diff --git a/nksrv/LobbyServer/Msgs/Shop/InApp/GetMarketingDetail.cs b/EpinelPS/LobbyServer/Msgs/Shop/InApp/GetMarketingDetail.cs similarity index 85% rename from nksrv/LobbyServer/Msgs/Shop/InApp/GetMarketingDetail.cs rename to EpinelPS/LobbyServer/Msgs/Shop/InApp/GetMarketingDetail.cs index ff65288..6497c91 100644 --- a/nksrv/LobbyServer/Msgs/Shop/InApp/GetMarketingDetail.cs +++ b/EpinelPS/LobbyServer/Msgs/Shop/InApp/GetMarketingDetail.cs @@ -1,6 +1,6 @@ -using nksrv.Utils; +using EpinelPS.Utils; -namespace nksrv.LobbyServer.Msgs.Shop.InApp +namespace EpinelPS.LobbyServer.Msgs.Shop.InApp { [PacketPath("/inappshop/jupiter/getmarketingdetail")] public class GetMarketingDetail : LobbyMsgHandler diff --git a/nksrv/LobbyServer/Msgs/Shop/InApp/GetMonthlySubscriptionReward.cs b/EpinelPS/LobbyServer/Msgs/Shop/InApp/GetMonthlySubscriptionReward.cs similarity index 86% rename from nksrv/LobbyServer/Msgs/Shop/InApp/GetMonthlySubscriptionReward.cs rename to EpinelPS/LobbyServer/Msgs/Shop/InApp/GetMonthlySubscriptionReward.cs index 83a53a4..ef1a295 100644 --- a/nksrv/LobbyServer/Msgs/Shop/InApp/GetMonthlySubscriptionReward.cs +++ b/EpinelPS/LobbyServer/Msgs/Shop/InApp/GetMonthlySubscriptionReward.cs @@ -1,6 +1,6 @@ -using nksrv.Utils; +using EpinelPS.Utils; -namespace nksrv.LobbyServer.Msgs.Shop.InApp +namespace EpinelPS.LobbyServer.Msgs.Shop.InApp { [PacketPath("/inappshop/getmonthlysubscriptionreward")] public class GetMonthlySubscriptionReward : LobbyMsgHandler diff --git a/nksrv/LobbyServer/Msgs/Shop/InApp/GetProductListInApp.cs b/EpinelPS/LobbyServer/Msgs/Shop/InApp/GetProductListInApp.cs similarity index 83% rename from nksrv/LobbyServer/Msgs/Shop/InApp/GetProductListInApp.cs rename to EpinelPS/LobbyServer/Msgs/Shop/InApp/GetProductListInApp.cs index 442cf75..1772958 100644 --- a/nksrv/LobbyServer/Msgs/Shop/InApp/GetProductListInApp.cs +++ b/EpinelPS/LobbyServer/Msgs/Shop/InApp/GetProductListInApp.cs @@ -1,6 +1,6 @@ -using nksrv.Utils; +using EpinelPS.Utils; -namespace nksrv.LobbyServer.Msgs.Shop.InApp +namespace EpinelPS.LobbyServer.Msgs.Shop.InApp { [PacketPath("/inappshop/getdata")] public class GetProductList : LobbyMsgHandler diff --git a/nksrv/LobbyServer/Msgs/Shop/InApp/GetRetrivableProductList.cs b/EpinelPS/LobbyServer/Msgs/Shop/InApp/GetRetrivableProductList.cs similarity index 85% rename from nksrv/LobbyServer/Msgs/Shop/InApp/GetRetrivableProductList.cs rename to EpinelPS/LobbyServer/Msgs/Shop/InApp/GetRetrivableProductList.cs index ce2bc72..2e348d2 100644 --- a/nksrv/LobbyServer/Msgs/Shop/InApp/GetRetrivableProductList.cs +++ b/EpinelPS/LobbyServer/Msgs/Shop/InApp/GetRetrivableProductList.cs @@ -1,6 +1,6 @@ -using nksrv.Utils; +using EpinelPS.Utils; -namespace nksrv.LobbyServer.Msgs.Shop.InApp +namespace EpinelPS.LobbyServer.Msgs.Shop.InApp { [PacketPath("/inappshop/getreceivableproductlist")] public class GetRetrivableProductList : LobbyMsgHandler diff --git a/nksrv/LobbyServer/Msgs/Shop/InApp/GetSetupDataForCustomPackage.cs b/EpinelPS/LobbyServer/Msgs/Shop/InApp/GetSetupDataForCustomPackage.cs similarity index 86% rename from nksrv/LobbyServer/Msgs/Shop/InApp/GetSetupDataForCustomPackage.cs rename to EpinelPS/LobbyServer/Msgs/Shop/InApp/GetSetupDataForCustomPackage.cs index 07bc051..db224a0 100644 --- a/nksrv/LobbyServer/Msgs/Shop/InApp/GetSetupDataForCustomPackage.cs +++ b/EpinelPS/LobbyServer/Msgs/Shop/InApp/GetSetupDataForCustomPackage.cs @@ -1,6 +1,6 @@ -using nksrv.Utils; +using EpinelPS.Utils; -namespace nksrv.LobbyServer.Msgs.Shop.InApp +namespace EpinelPS.LobbyServer.Msgs.Shop.InApp { [PacketPath("/inappshop/custompackage/getsetupdata")] public class GetCharacterAttractiveList : LobbyMsgHandler diff --git a/nksrv/LobbyServer/Msgs/Shop/PackageShop/GetPackagePopupState.cs b/EpinelPS/LobbyServer/Msgs/Shop/PackageShop/GetPackagePopupState.cs similarity index 82% rename from nksrv/LobbyServer/Msgs/Shop/PackageShop/GetPackagePopupState.cs rename to EpinelPS/LobbyServer/Msgs/Shop/PackageShop/GetPackagePopupState.cs index bab1b2d..4d855f5 100644 --- a/nksrv/LobbyServer/Msgs/Shop/PackageShop/GetPackagePopupState.cs +++ b/EpinelPS/LobbyServer/Msgs/Shop/PackageShop/GetPackagePopupState.cs @@ -1,6 +1,6 @@ -using nksrv.Utils; +using EpinelPS.Utils; -namespace nksrv.LobbyServer.Msgs.Shop.PackageShop +namespace EpinelPS.LobbyServer.Msgs.Shop.PackageShop { [PacketPath("/packageshop/getpopuppackagestate")] public class GetPackagePopupState : LobbyMsgHandler diff --git a/nksrv/LobbyServer/Msgs/Shop/PackageShop/PackageShopGetCampaignPackage.cs b/EpinelPS/LobbyServer/Msgs/Shop/PackageShop/PackageShopGetCampaignPackage.cs similarity index 85% rename from nksrv/LobbyServer/Msgs/Shop/PackageShop/PackageShopGetCampaignPackage.cs rename to EpinelPS/LobbyServer/Msgs/Shop/PackageShop/PackageShopGetCampaignPackage.cs index 13e034e..ca6ec26 100644 --- a/nksrv/LobbyServer/Msgs/Shop/PackageShop/PackageShopGetCampaignPackage.cs +++ b/EpinelPS/LobbyServer/Msgs/Shop/PackageShop/PackageShopGetCampaignPackage.cs @@ -1,6 +1,6 @@ -using nksrv.Utils; +using EpinelPS.Utils; -namespace nksrv.LobbyServer.Msgs.Shop.PackageShop +namespace EpinelPS.LobbyServer.Msgs.Shop.PackageShop { [PacketPath("/packageshop/campaign/get")] public class PackageShopGetCampaignPackage : LobbyMsgHandler diff --git a/nksrv/LobbyServer/Msgs/Sidestory/ClearBattle.cs b/EpinelPS/LobbyServer/Msgs/Sidestory/ClearBattle.cs similarity index 82% rename from nksrv/LobbyServer/Msgs/Sidestory/ClearBattle.cs rename to EpinelPS/LobbyServer/Msgs/Sidestory/ClearBattle.cs index a12ca31..8482359 100644 --- a/nksrv/LobbyServer/Msgs/Sidestory/ClearBattle.cs +++ b/EpinelPS/LobbyServer/Msgs/Sidestory/ClearBattle.cs @@ -1,7 +1,7 @@ -using nksrv.Net; -using nksrv.Utils; +using EpinelPS.Net; +using EpinelPS.Utils; -namespace nksrv.LobbyServer.Msgs.Sidestory +namespace EpinelPS.LobbyServer.Msgs.Sidestory { [PacketPath("/sidestory/cut/clearbattle")] public class ClearBattle : LobbyMsgHandler diff --git a/nksrv/LobbyServer/Msgs/Sidestory/ClearSideStoryCut.cs b/EpinelPS/LobbyServer/Msgs/Sidestory/ClearSideStoryCut.cs similarity index 85% rename from nksrv/LobbyServer/Msgs/Sidestory/ClearSideStoryCut.cs rename to EpinelPS/LobbyServer/Msgs/Sidestory/ClearSideStoryCut.cs index 452513f..83166d0 100644 --- a/nksrv/LobbyServer/Msgs/Sidestory/ClearSideStoryCut.cs +++ b/EpinelPS/LobbyServer/Msgs/Sidestory/ClearSideStoryCut.cs @@ -1,12 +1,12 @@ -using nksrv.Net; -using nksrv.Utils; +using EpinelPS.Net; +using EpinelPS.Utils; using System; using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; -namespace nksrv.LobbyServer.Msgs.Sidestory +namespace EpinelPS.LobbyServer.Msgs.Sidestory { [PacketPath("/sidestory/cut/clearscenario")] public class ClearSideStoryCut : LobbyMsgHandler diff --git a/nksrv/LobbyServer/Msgs/Sidestory/ClearSideStoryStage.cs b/EpinelPS/LobbyServer/Msgs/Sidestory/ClearSideStoryStage.cs similarity index 70% rename from nksrv/LobbyServer/Msgs/Sidestory/ClearSideStoryStage.cs rename to EpinelPS/LobbyServer/Msgs/Sidestory/ClearSideStoryStage.cs index aa9cc41..6e851fd 100644 --- a/nksrv/LobbyServer/Msgs/Sidestory/ClearSideStoryStage.cs +++ b/EpinelPS/LobbyServer/Msgs/Sidestory/ClearSideStoryStage.cs @@ -1,15 +1,15 @@ -using nksrv.Database; -using nksrv.LobbyServer.Msgs.Stage; -using nksrv.Net; -using nksrv.StaticInfo; -using nksrv.Utils; +using EpinelPS.Database; +using EpinelPS.LobbyServer.Msgs.Stage; +using EpinelPS.Net; +using EpinelPS.StaticInfo; +using EpinelPS.Utils; using System; using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; -namespace nksrv.LobbyServer.Msgs.Sidestory +namespace EpinelPS.LobbyServer.Msgs.Sidestory { [PacketPath("/sidestory/stage/clear")] public class ClearSideStoryStage : LobbyMsgHandler @@ -25,9 +25,9 @@ namespace nksrv.LobbyServer.Msgs.Sidestory { user.CompletedSideStoryStages.Add(req.SideStoryStageId); - if (StaticDataParser.Instance.SidestoryRewardTable.ContainsKey(req.SideStoryStageId)) + if (GameData.Instance.SidestoryRewardTable.ContainsKey(req.SideStoryStageId)) { - var rewardData = StaticDataParser.Instance.GetRewardTableEntry(StaticDataParser.Instance.SidestoryRewardTable[req.SideStoryStageId]); + var rewardData = GameData.Instance.GetRewardTableEntry(GameData.Instance.SidestoryRewardTable[req.SideStoryStageId]); if (rewardData != null) response.Reward = ClearStage.RegisterRewardsForUser(user, rewardData); diff --git a/nksrv/LobbyServer/Msgs/Sidestory/EnterBattle.cs b/EpinelPS/LobbyServer/Msgs/Sidestory/EnterBattle.cs similarity index 81% rename from nksrv/LobbyServer/Msgs/Sidestory/EnterBattle.cs rename to EpinelPS/LobbyServer/Msgs/Sidestory/EnterBattle.cs index 7990a78..7d97ef1 100644 --- a/nksrv/LobbyServer/Msgs/Sidestory/EnterBattle.cs +++ b/EpinelPS/LobbyServer/Msgs/Sidestory/EnterBattle.cs @@ -1,7 +1,7 @@ -using nksrv.Net; -using nksrv.Utils; +using EpinelPS.Net; +using EpinelPS.Utils; -namespace nksrv.LobbyServer.Msgs.Sidestory +namespace EpinelPS.LobbyServer.Msgs.Sidestory { [PacketPath("/sidestory/cut/enterbattle")] public class EnterBattle : LobbyMsgHandler diff --git a/nksrv/LobbyServer/Msgs/Sidestory/EnterSidestoryStage.cs b/EpinelPS/LobbyServer/Msgs/Sidestory/EnterSidestoryStage.cs similarity index 85% rename from nksrv/LobbyServer/Msgs/Sidestory/EnterSidestoryStage.cs rename to EpinelPS/LobbyServer/Msgs/Sidestory/EnterSidestoryStage.cs index 74a5261..e2414a9 100644 --- a/nksrv/LobbyServer/Msgs/Sidestory/EnterSidestoryStage.cs +++ b/EpinelPS/LobbyServer/Msgs/Sidestory/EnterSidestoryStage.cs @@ -1,12 +1,12 @@ -using nksrv.Net; -using nksrv.Utils; +using EpinelPS.Net; +using EpinelPS.Utils; using System; using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; -namespace nksrv.LobbyServer.Msgs.Sidestory +namespace EpinelPS.LobbyServer.Msgs.Sidestory { [PacketPath("/sidestory/stage/enter")] public class EnterSidestoryStage : LobbyMsgHandler diff --git a/nksrv/LobbyServer/Msgs/Sidestory/ListSideStory.cs b/EpinelPS/LobbyServer/Msgs/Sidestory/ListSideStory.cs similarity index 88% rename from nksrv/LobbyServer/Msgs/Sidestory/ListSideStory.cs rename to EpinelPS/LobbyServer/Msgs/Sidestory/ListSideStory.cs index 49ecf2e..821454e 100644 --- a/nksrv/LobbyServer/Msgs/Sidestory/ListSideStory.cs +++ b/EpinelPS/LobbyServer/Msgs/Sidestory/ListSideStory.cs @@ -1,8 +1,8 @@ using Google.Protobuf.WellKnownTypes; -using nksrv.Net; -using nksrv.Utils; +using EpinelPS.Net; +using EpinelPS.Utils; -namespace nksrv.LobbyServer.Msgs.Sidestory +namespace EpinelPS.LobbyServer.Msgs.Sidestory { [PacketPath("/sidestory/list")] public class ListSideStory : LobbyMsgHandler diff --git a/nksrv/LobbyServer/Msgs/Simroom/GetSimRoomData.cs b/EpinelPS/LobbyServer/Msgs/Simroom/GetSimRoomData.cs similarity index 93% rename from nksrv/LobbyServer/Msgs/Simroom/GetSimRoomData.cs rename to EpinelPS/LobbyServer/Msgs/Simroom/GetSimRoomData.cs index fe5c517..a332bcb 100644 --- a/nksrv/LobbyServer/Msgs/Simroom/GetSimRoomData.cs +++ b/EpinelPS/LobbyServer/Msgs/Simroom/GetSimRoomData.cs @@ -1,7 +1,7 @@ using Google.Protobuf.WellKnownTypes; -using nksrv.Utils; +using EpinelPS.Utils; -namespace nksrv.LobbyServer.Msgs.Simroom +namespace EpinelPS.LobbyServer.Msgs.Simroom { [PacketPath("/simroom/get")] public class GetSimRoomData : LobbyMsgHandler diff --git a/nksrv/LobbyServer/Msgs/Soloraid/GetSoloraidPeriod.cs b/EpinelPS/LobbyServer/Msgs/Soloraid/GetSoloraidPeriod.cs similarity index 86% rename from nksrv/LobbyServer/Msgs/Soloraid/GetSoloraidPeriod.cs rename to EpinelPS/LobbyServer/Msgs/Soloraid/GetSoloraidPeriod.cs index e237cc0..e72e9bb 100644 --- a/nksrv/LobbyServer/Msgs/Soloraid/GetSoloraidPeriod.cs +++ b/EpinelPS/LobbyServer/Msgs/Soloraid/GetSoloraidPeriod.cs @@ -1,6 +1,6 @@ -using nksrv.Utils; +using EpinelPS.Utils; -namespace nksrv.LobbyServer.Msgs.Soloraid +namespace EpinelPS.LobbyServer.Msgs.Soloraid { [PacketPath("/soloraid/getperiod")] public class GetSoloraidPeriod : LobbyMsgHandler diff --git a/nksrv/LobbyServer/Msgs/Stage/CheckCleared.cs b/EpinelPS/LobbyServer/Msgs/Stage/CheckCleared.cs similarity index 91% rename from nksrv/LobbyServer/Msgs/Stage/CheckCleared.cs rename to EpinelPS/LobbyServer/Msgs/Stage/CheckCleared.cs index d79b008..8ea6a86 100644 --- a/nksrv/LobbyServer/Msgs/Stage/CheckCleared.cs +++ b/EpinelPS/LobbyServer/Msgs/Stage/CheckCleared.cs @@ -1,6 +1,6 @@ -using nksrv.Utils; +using EpinelPS.Utils; -namespace nksrv.LobbyServer.Msgs.Stage +namespace EpinelPS.LobbyServer.Msgs.Stage { [PacketPath("/stage/checkclear")] public class CheckCleared : LobbyMsgHandler diff --git a/nksrv/LobbyServer/Msgs/Stage/ClearStage.cs b/EpinelPS/LobbyServer/Msgs/Stage/ClearStage.cs similarity index 93% rename from nksrv/LobbyServer/Msgs/Stage/ClearStage.cs rename to EpinelPS/LobbyServer/Msgs/Stage/ClearStage.cs index fbc75ae..e50170d 100644 --- a/nksrv/LobbyServer/Msgs/Stage/ClearStage.cs +++ b/EpinelPS/LobbyServer/Msgs/Stage/ClearStage.cs @@ -1,9 +1,9 @@ -using nksrv.Database; -using nksrv.StaticInfo; -using nksrv.Utils; +using EpinelPS.Database; +using EpinelPS.StaticInfo; +using EpinelPS.Utils; using Swan.Logging; -namespace nksrv.LobbyServer.Msgs.Stage +namespace EpinelPS.LobbyServer.Msgs.Stage { [PacketPath("/stage/clearstage")] public class ClearStage : LobbyMsgHandler @@ -30,7 +30,7 @@ namespace nksrv.LobbyServer.Msgs.Stage public static ResClearStage CompleteStage(Database.User user, int StageId, bool forceCompleteScenarios = false) { var response = new ResClearStage(); - var clearedStage = StaticDataParser.Instance.GetStageData(StageId); + var clearedStage = GameData.Instance.GetStageData(StageId); if (clearedStage == null) throw new Exception("cleared stage cannot be null"); @@ -40,7 +40,7 @@ namespace nksrv.LobbyServer.Msgs.Stage } DoQuestSpecificUserOperations(user, StageId); - var rewardData = StaticDataParser.Instance.GetRewardTableEntry(clearedStage.reward_id); + var rewardData = GameData.Instance.GetRewardTableEntry(clearedStage.reward_id); if (forceCompleteScenarios) @@ -123,8 +123,8 @@ namespace nksrv.LobbyServer.Msgs.Stage { var newXp = rewardData.user_exp + user.userPointData.ExperiencePoint; - var oldXpData = StaticDataParser.Instance.GetUserLevelFromUserExp(user.userPointData.ExperiencePoint); - var newLevelExp = StaticDataParser.Instance.GetUserMinXpForLevel(user.userPointData.UserLevel + 1); + var oldXpData = GameData.Instance.GetUserLevelFromUserExp(user.userPointData.ExperiencePoint); + var newLevelExp = GameData.Instance.GetUserMinXpForLevel(user.userPointData.UserLevel + 1); var newLevel = user.userPointData.UserLevel; if (newLevelExp == -1) @@ -142,7 +142,7 @@ namespace nksrv.LobbyServer.Msgs.Stage else user.Currency.Add(CurrencyType.FreeCash, 30); - newLevelExp = StaticDataParser.Instance.GetUserMinXpForLevel(newLevel + 1); + newLevelExp = GameData.Instance.GetUserMinXpForLevel(newLevel + 1); } @@ -225,7 +225,7 @@ namespace nksrv.LobbyServer.Msgs.Stage private static void DoQuestSpecificUserOperations(Database.User user, int clearedStageId) { - var quest = StaticDataParser.Instance.GetMainQuestForStageClearCondition(clearedStageId); + var quest = GameData.Instance.GetMainQuestForStageClearCondition(clearedStageId); if (quest != null) user.SetQuest(quest.id, false); diff --git a/nksrv/LobbyServer/Msgs/Stage/EnterStage.cs b/EpinelPS/LobbyServer/Msgs/Stage/EnterStage.cs similarity index 82% rename from nksrv/LobbyServer/Msgs/Stage/EnterStage.cs rename to EpinelPS/LobbyServer/Msgs/Stage/EnterStage.cs index cf1aa06..5e8a509 100644 --- a/nksrv/LobbyServer/Msgs/Stage/EnterStage.cs +++ b/EpinelPS/LobbyServer/Msgs/Stage/EnterStage.cs @@ -1,6 +1,6 @@ -using nksrv.Utils; +using EpinelPS.Utils; -namespace nksrv.LobbyServer.Msgs.Stage +namespace EpinelPS.LobbyServer.Msgs.Stage { [PacketPath("/stage/enterstage")] public class EnterStage : LobbyMsgHandler diff --git a/nksrv/LobbyServer/Msgs/Stage/GetStage.cs b/EpinelPS/LobbyServer/Msgs/Stage/GetStage.cs similarity index 94% rename from nksrv/LobbyServer/Msgs/Stage/GetStage.cs rename to EpinelPS/LobbyServer/Msgs/Stage/GetStage.cs index a0775e9..2371370 100644 --- a/nksrv/LobbyServer/Msgs/Stage/GetStage.cs +++ b/EpinelPS/LobbyServer/Msgs/Stage/GetStage.cs @@ -1,7 +1,7 @@ -using nksrv.Database; -using nksrv.Utils; +using EpinelPS.Database; +using EpinelPS.Utils; -namespace nksrv.LobbyServer.Msgs.Stage +namespace EpinelPS.LobbyServer.Msgs.Stage { [PacketPath("/stage/get")] public class GetStage : LobbyMsgHandler diff --git a/nksrv/LobbyServer/Msgs/Subquest/ListSubquests.cs b/EpinelPS/LobbyServer/Msgs/Subquest/ListSubquests.cs similarity index 83% rename from nksrv/LobbyServer/Msgs/Subquest/ListSubquests.cs rename to EpinelPS/LobbyServer/Msgs/Subquest/ListSubquests.cs index d6ec344..c7eae87 100644 --- a/nksrv/LobbyServer/Msgs/Subquest/ListSubquests.cs +++ b/EpinelPS/LobbyServer/Msgs/Subquest/ListSubquests.cs @@ -1,6 +1,6 @@ -using nksrv.Utils; +using EpinelPS.Utils; -namespace nksrv.LobbyServer.Msgs.Subquest +namespace EpinelPS.LobbyServer.Msgs.Subquest { [PacketPath("/subquest/list")] public class ListSubquests : LobbyMsgHandler diff --git a/nksrv/LobbyServer/Msgs/System/CheckClientVersion.cs b/EpinelPS/LobbyServer/Msgs/System/CheckClientVersion.cs similarity index 86% rename from nksrv/LobbyServer/Msgs/System/CheckClientVersion.cs rename to EpinelPS/LobbyServer/Msgs/System/CheckClientVersion.cs index b5c07db..6d087e4 100644 --- a/nksrv/LobbyServer/Msgs/System/CheckClientVersion.cs +++ b/EpinelPS/LobbyServer/Msgs/System/CheckClientVersion.cs @@ -1,7 +1,7 @@ -using nksrv.Net; -using nksrv.Utils; +using EpinelPS.Net; +using EpinelPS.Utils; -namespace nksrv.LobbyServer.Msgs.System +namespace EpinelPS.LobbyServer.Msgs.System { [PacketPath("/system/checkversion")] public class CheckClientVersion : LobbyMsgHandler diff --git a/nksrv/LobbyServer/Msgs/Team/GetTeamData.cs b/EpinelPS/LobbyServer/Msgs/Team/GetTeamData.cs similarity index 90% rename from nksrv/LobbyServer/Msgs/Team/GetTeamData.cs rename to EpinelPS/LobbyServer/Msgs/Team/GetTeamData.cs index 03c7b37..72635cb 100644 --- a/nksrv/LobbyServer/Msgs/Team/GetTeamData.cs +++ b/EpinelPS/LobbyServer/Msgs/Team/GetTeamData.cs @@ -1,6 +1,6 @@ -using nksrv.Utils; +using EpinelPS.Utils; -namespace nksrv.LobbyServer.Msgs.Team +namespace EpinelPS.LobbyServer.Msgs.Team { [PacketPath("/team/get")] public class GetTeamData : LobbyMsgHandler diff --git a/nksrv/LobbyServer/Msgs/Team/ListSupportCharacterCount.cs b/EpinelPS/LobbyServer/Msgs/Team/ListSupportCharacterCount.cs similarity index 90% rename from nksrv/LobbyServer/Msgs/Team/ListSupportCharacterCount.cs rename to EpinelPS/LobbyServer/Msgs/Team/ListSupportCharacterCount.cs index e3b25b2..ff3ee4f 100644 --- a/nksrv/LobbyServer/Msgs/Team/ListSupportCharacterCount.cs +++ b/EpinelPS/LobbyServer/Msgs/Team/ListSupportCharacterCount.cs @@ -1,6 +1,6 @@ -using nksrv.Utils; +using EpinelPS.Utils; -namespace nksrv.LobbyServer.Msgs.Team +namespace EpinelPS.LobbyServer.Msgs.Team { [PacketPath("/team/support-character/list-used-count")] public class ListSupportCharacterCount : LobbyMsgHandler diff --git a/nksrv/LobbyServer/Msgs/Team/SetTeam.cs b/EpinelPS/LobbyServer/Msgs/Team/SetTeam.cs similarity index 91% rename from nksrv/LobbyServer/Msgs/Team/SetTeam.cs rename to EpinelPS/LobbyServer/Msgs/Team/SetTeam.cs index ecc8141..4e7dfb2 100644 --- a/nksrv/LobbyServer/Msgs/Team/SetTeam.cs +++ b/EpinelPS/LobbyServer/Msgs/Team/SetTeam.cs @@ -1,7 +1,7 @@ -using nksrv.Database; -using nksrv.Utils; +using EpinelPS.Database; +using EpinelPS.Utils; -namespace nksrv.LobbyServer.Msgs.Team +namespace EpinelPS.LobbyServer.Msgs.Team { [PacketPath("/team/setteam")] public class SetTeam : LobbyMsgHandler diff --git a/nksrv/LobbyServer/Msgs/Tower/GetTowerData.cs b/EpinelPS/LobbyServer/Msgs/Tower/GetTowerData.cs similarity index 95% rename from nksrv/LobbyServer/Msgs/Tower/GetTowerData.cs rename to EpinelPS/LobbyServer/Msgs/Tower/GetTowerData.cs index ef1abbb..a60e60c 100644 --- a/nksrv/LobbyServer/Msgs/Tower/GetTowerData.cs +++ b/EpinelPS/LobbyServer/Msgs/Tower/GetTowerData.cs @@ -1,6 +1,6 @@ -using nksrv.Utils; +using EpinelPS.Utils; -namespace nksrv.LobbyServer.Msgs.Tower +namespace EpinelPS.LobbyServer.Msgs.Tower { [PacketPath("/tower/gettowerdata")] public class GetTowerData : LobbyMsgHandler diff --git a/nksrv/LobbyServer/Msgs/Trigger/FinishMainQuest.cs b/EpinelPS/LobbyServer/Msgs/Trigger/FinishMainQuest.cs similarity index 73% rename from nksrv/LobbyServer/Msgs/Trigger/FinishMainQuest.cs rename to EpinelPS/LobbyServer/Msgs/Trigger/FinishMainQuest.cs index b1329ac..502a94c 100644 --- a/nksrv/LobbyServer/Msgs/Trigger/FinishMainQuest.cs +++ b/EpinelPS/LobbyServer/Msgs/Trigger/FinishMainQuest.cs @@ -1,8 +1,8 @@ -using nksrv.Database; -using nksrv.StaticInfo; -using nksrv.Utils; +using EpinelPS.Database; +using EpinelPS.StaticInfo; +using EpinelPS.Utils; -namespace nksrv.LobbyServer.Msgs.Trigger +namespace EpinelPS.LobbyServer.Msgs.Trigger { [PacketPath("/Trigger/FinMainQuest")] public class FinishMainQuest : LobbyMsgHandler @@ -14,7 +14,7 @@ namespace nksrv.LobbyServer.Msgs.Trigger Console.WriteLine("Complete quest: " + req.Tid); user.SetQuest(req.Tid, false); - var completedQuest = StaticDataParser.Instance.GetMainQuestByTableId(req.Tid); + var completedQuest = GameData.Instance.GetMainQuestByTableId(req.Tid); if (completedQuest == null) throw new Exception("Quest not found"); JsonDb.Save(); diff --git a/nksrv/LobbyServer/Msgs/Trigger/GetMainQuestData.cs b/EpinelPS/LobbyServer/Msgs/Trigger/GetMainQuestData.cs similarity index 89% rename from nksrv/LobbyServer/Msgs/Trigger/GetMainQuestData.cs rename to EpinelPS/LobbyServer/Msgs/Trigger/GetMainQuestData.cs index f2910bf..ae71c92 100644 --- a/nksrv/LobbyServer/Msgs/Trigger/GetMainQuestData.cs +++ b/EpinelPS/LobbyServer/Msgs/Trigger/GetMainQuestData.cs @@ -1,6 +1,6 @@ -using nksrv.Utils; +using EpinelPS.Utils; -namespace nksrv.LobbyServer.Msgs.Trigger +namespace EpinelPS.LobbyServer.Msgs.Trigger { [PacketPath("/Trigger/GetMainQuestData")] public class GetMainQuestData : LobbyMsgHandler diff --git a/nksrv/LobbyServer/Msgs/Trigger/ObtainMainQuestReward.cs b/EpinelPS/LobbyServer/Msgs/Trigger/ObtainMainQuestReward.cs similarity index 77% rename from nksrv/LobbyServer/Msgs/Trigger/ObtainMainQuestReward.cs rename to EpinelPS/LobbyServer/Msgs/Trigger/ObtainMainQuestReward.cs index e39b9c7..d425f5c 100644 --- a/nksrv/LobbyServer/Msgs/Trigger/ObtainMainQuestReward.cs +++ b/EpinelPS/LobbyServer/Msgs/Trigger/ObtainMainQuestReward.cs @@ -1,14 +1,14 @@ -using nksrv.Database; -using nksrv.LobbyServer.Msgs.Stage; -using nksrv.StaticInfo; -using nksrv.Utils; +using EpinelPS.Database; +using EpinelPS.LobbyServer.Msgs.Stage; +using EpinelPS.StaticInfo; +using EpinelPS.Utils; using System; using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; -namespace nksrv.LobbyServer.Msgs.Trigger +namespace EpinelPS.LobbyServer.Msgs.Trigger { [PacketPath("/trigger/obtainmainquestreward")] public class ObtainMainQuestReward : LobbyMsgHandler @@ -27,9 +27,9 @@ namespace nksrv.LobbyServer.Msgs.Trigger { user.MainQuestData[item.Key] = true; - var questInfo = StaticDataParser.Instance.GetMainQuestByTableId(item.Key); + var questInfo = GameData.Instance.GetMainQuestByTableId(item.Key); if (questInfo == null) throw new Exception("failed to lookup quest id " + item.Key); - var reward = StaticDataParser.Instance.GetRewardTableEntry(questInfo.reward_id); + var reward = GameData.Instance.GetRewardTableEntry(questInfo.reward_id); if (reward == null) throw new Exception("failed to lookup reward id " + questInfo.reward_id); rewards.Add(ClearStage.RegisterRewardsForUser(user, reward)); diff --git a/nksrv/LobbyServer/Msgs/Trigger/TriggerSync.cs b/EpinelPS/LobbyServer/Msgs/Trigger/TriggerSync.cs similarity index 81% rename from nksrv/LobbyServer/Msgs/Trigger/TriggerSync.cs rename to EpinelPS/LobbyServer/Msgs/Trigger/TriggerSync.cs index 5f31224..fde4494 100644 --- a/nksrv/LobbyServer/Msgs/Trigger/TriggerSync.cs +++ b/EpinelPS/LobbyServer/Msgs/Trigger/TriggerSync.cs @@ -1,6 +1,6 @@ -using nksrv.Utils; +using EpinelPS.Utils; -namespace nksrv.LobbyServer.Msgs.Trigger +namespace EpinelPS.LobbyServer.Msgs.Trigger { [PacketPath("/trigger/sync")] public class TriggerSync : LobbyMsgHandler diff --git a/nksrv/LobbyServer/Msgs/User/EnterLobbyServer.cs b/EpinelPS/LobbyServer/Msgs/User/EnterLobbyServer.cs similarity index 98% rename from nksrv/LobbyServer/Msgs/User/EnterLobbyServer.cs rename to EpinelPS/LobbyServer/Msgs/User/EnterLobbyServer.cs index 1fd1896..e20fc40 100644 --- a/nksrv/LobbyServer/Msgs/User/EnterLobbyServer.cs +++ b/EpinelPS/LobbyServer/Msgs/User/EnterLobbyServer.cs @@ -1,7 +1,7 @@ -using nksrv.Database; -using nksrv.Utils; +using EpinelPS.Database; +using EpinelPS.Utils; -namespace nksrv.LobbyServer.Msgs.User +namespace EpinelPS.LobbyServer.Msgs.User { [PacketPath("/enterlobbyserver")] public class EnterLobbyServer : LobbyMsgHandler diff --git a/nksrv/LobbyServer/Msgs/User/GetAllFeatureFlags.cs b/EpinelPS/LobbyServer/Msgs/User/GetAllFeatureFlags.cs similarity index 98% rename from nksrv/LobbyServer/Msgs/User/GetAllFeatureFlags.cs rename to EpinelPS/LobbyServer/Msgs/User/GetAllFeatureFlags.cs index 79d6f26..f9c99a2 100644 --- a/nksrv/LobbyServer/Msgs/User/GetAllFeatureFlags.cs +++ b/EpinelPS/LobbyServer/Msgs/User/GetAllFeatureFlags.cs @@ -1,6 +1,6 @@ -using nksrv.Utils; +using EpinelPS.Utils; -namespace nksrv.LobbyServer.Msgs.User +namespace EpinelPS.LobbyServer.Msgs.User { [PacketPath("/featureflags/all/get")] public class GetAllFeatureFlags : LobbyMsgHandler diff --git a/nksrv/LobbyServer/Msgs/User/GetContentsData.cs b/EpinelPS/LobbyServer/Msgs/User/GetContentsData.cs similarity index 94% rename from nksrv/LobbyServer/Msgs/User/GetContentsData.cs rename to EpinelPS/LobbyServer/Msgs/User/GetContentsData.cs index 2b3e3d1..9ae7471 100644 --- a/nksrv/LobbyServer/Msgs/User/GetContentsData.cs +++ b/EpinelPS/LobbyServer/Msgs/User/GetContentsData.cs @@ -1,6 +1,6 @@ -using nksrv.Utils; +using EpinelPS.Utils; -namespace nksrv.LobbyServer.Msgs.User +namespace EpinelPS.LobbyServer.Msgs.User { [PacketPath("/user/getcontentsdata")] public class GetContentsData : LobbyMsgHandler diff --git a/nksrv/LobbyServer/Msgs/User/GetFieldTalkList.cs b/EpinelPS/LobbyServer/Msgs/User/GetFieldTalkList.cs similarity index 85% rename from nksrv/LobbyServer/Msgs/User/GetFieldTalkList.cs rename to EpinelPS/LobbyServer/Msgs/User/GetFieldTalkList.cs index 34e45cb..3dd40d5 100644 --- a/nksrv/LobbyServer/Msgs/User/GetFieldTalkList.cs +++ b/EpinelPS/LobbyServer/Msgs/User/GetFieldTalkList.cs @@ -1,6 +1,6 @@ -using nksrv.Utils; +using EpinelPS.Utils; -namespace nksrv.LobbyServer.Msgs.User +namespace EpinelPS.LobbyServer.Msgs.User { [PacketPath("/user/getfieldtalklist")] public class GetFieldTalkList : LobbyMsgHandler diff --git a/nksrv/LobbyServer/Msgs/User/GetMail.cs b/EpinelPS/LobbyServer/Msgs/User/GetMail.cs similarity index 93% rename from nksrv/LobbyServer/Msgs/User/GetMail.cs rename to EpinelPS/LobbyServer/Msgs/User/GetMail.cs index f6de663..1fa8de5 100644 --- a/nksrv/LobbyServer/Msgs/User/GetMail.cs +++ b/EpinelPS/LobbyServer/Msgs/User/GetMail.cs @@ -1,7 +1,7 @@ -using nksrv.Utils; +using EpinelPS.Utils; using Swan; -namespace nksrv.LobbyServer.Msgs.User +namespace EpinelPS.LobbyServer.Msgs.User { [PacketPath("/mail/get")] public class GetMail : LobbyMsgHandler diff --git a/nksrv/LobbyServer/Msgs/User/GetProfileCardPossession.cs b/EpinelPS/LobbyServer/Msgs/User/GetProfileCardPossession.cs similarity index 85% rename from nksrv/LobbyServer/Msgs/User/GetProfileCardPossession.cs rename to EpinelPS/LobbyServer/Msgs/User/GetProfileCardPossession.cs index 0f2a56a..e709b72 100644 --- a/nksrv/LobbyServer/Msgs/User/GetProfileCardPossession.cs +++ b/EpinelPS/LobbyServer/Msgs/User/GetProfileCardPossession.cs @@ -1,6 +1,6 @@ -using nksrv.Utils; +using EpinelPS.Utils; -namespace nksrv.LobbyServer.Msgs.User +namespace EpinelPS.LobbyServer.Msgs.User { [PacketPath("/ProfileCard/Possession/Get")] public class GetProfileCardPossession : LobbyMsgHandler diff --git a/nksrv/LobbyServer/Msgs/User/GetProfileDecoration.cs b/EpinelPS/LobbyServer/Msgs/User/GetProfileDecoration.cs similarity index 87% rename from nksrv/LobbyServer/Msgs/User/GetProfileDecoration.cs rename to EpinelPS/LobbyServer/Msgs/User/GetProfileDecoration.cs index a57db0b..ab02bba 100644 --- a/nksrv/LobbyServer/Msgs/User/GetProfileDecoration.cs +++ b/EpinelPS/LobbyServer/Msgs/User/GetProfileDecoration.cs @@ -1,6 +1,6 @@ -using nksrv.Utils; +using EpinelPS.Utils; -namespace nksrv.LobbyServer.Msgs.User +namespace EpinelPS.LobbyServer.Msgs.User { [PacketPath("/ProfileCard/DecorationLayout/Get")] public class GetProfileDecoration : LobbyMsgHandler diff --git a/nksrv/LobbyServer/Msgs/User/GetProfileFrame.cs b/EpinelPS/LobbyServer/Msgs/User/GetProfileFrame.cs similarity index 84% rename from nksrv/LobbyServer/Msgs/User/GetProfileFrame.cs rename to EpinelPS/LobbyServer/Msgs/User/GetProfileFrame.cs index 1ae1358..19d9320 100644 --- a/nksrv/LobbyServer/Msgs/User/GetProfileFrame.cs +++ b/EpinelPS/LobbyServer/Msgs/User/GetProfileFrame.cs @@ -1,6 +1,6 @@ -using nksrv.Utils; +using EpinelPS.Utils; -namespace nksrv.LobbyServer.Msgs.User +namespace EpinelPS.LobbyServer.Msgs.User { [PacketPath("/User/GetProfileFrame")] public class GetProfileFrame : LobbyMsgHandler diff --git a/nksrv/LobbyServer/Msgs/User/GetScenarioList.cs b/EpinelPS/LobbyServer/Msgs/User/GetScenarioList.cs similarity index 90% rename from nksrv/LobbyServer/Msgs/User/GetScenarioList.cs rename to EpinelPS/LobbyServer/Msgs/User/GetScenarioList.cs index 52ede9e..4b43510 100644 --- a/nksrv/LobbyServer/Msgs/User/GetScenarioList.cs +++ b/EpinelPS/LobbyServer/Msgs/User/GetScenarioList.cs @@ -1,6 +1,6 @@ -using nksrv.Utils; +using EpinelPS.Utils; -namespace nksrv.LobbyServer.Msgs.User +namespace EpinelPS.LobbyServer.Msgs.User { [PacketPath("/User/GetScenarioList")] public class GetScenarioList : LobbyMsgHandler diff --git a/nksrv/LobbyServer/Msgs/User/GetSpecialLobbySlotData.cs b/EpinelPS/LobbyServer/Msgs/User/GetSpecialLobbySlotData.cs similarity index 88% rename from nksrv/LobbyServer/Msgs/User/GetSpecialLobbySlotData.cs rename to EpinelPS/LobbyServer/Msgs/User/GetSpecialLobbySlotData.cs index 31b786e..ba7a1ec 100644 --- a/nksrv/LobbyServer/Msgs/User/GetSpecialLobbySlotData.cs +++ b/EpinelPS/LobbyServer/Msgs/User/GetSpecialLobbySlotData.cs @@ -1,11 +1,11 @@ -using nksrv.Utils; +using EpinelPS.Utils; using System; using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; -namespace nksrv.LobbyServer.Msgs.User +namespace EpinelPS.LobbyServer.Msgs.User { [PacketPath("/user/speciallobbyslot/get")] public class GetSpecialLobbySlotData : LobbyMsgHandler diff --git a/nksrv/LobbyServer/Msgs/User/GetUser.cs b/EpinelPS/LobbyServer/Msgs/User/GetUser.cs similarity index 96% rename from nksrv/LobbyServer/Msgs/User/GetUser.cs rename to EpinelPS/LobbyServer/Msgs/User/GetUser.cs index 96bebab..324989e 100644 --- a/nksrv/LobbyServer/Msgs/User/GetUser.cs +++ b/EpinelPS/LobbyServer/Msgs/User/GetUser.cs @@ -1,6 +1,6 @@ -using nksrv.Utils; +using EpinelPS.Utils; -namespace nksrv.LobbyServer.Msgs.User +namespace EpinelPS.LobbyServer.Msgs.User { [PacketPath("/User/Get")] public class GetUser : LobbyMsgHandler diff --git a/nksrv/LobbyServer/Msgs/User/GetUserProfile.cs b/EpinelPS/LobbyServer/Msgs/User/GetUserProfile.cs similarity index 96% rename from nksrv/LobbyServer/Msgs/User/GetUserProfile.cs rename to EpinelPS/LobbyServer/Msgs/User/GetUserProfile.cs index ebfe616..5d05275 100644 --- a/nksrv/LobbyServer/Msgs/User/GetUserProfile.cs +++ b/EpinelPS/LobbyServer/Msgs/User/GetUserProfile.cs @@ -1,7 +1,7 @@ -using nksrv.Utils; +using EpinelPS.Utils; using Swan.Logging; -namespace nksrv.LobbyServer.Msgs.User +namespace EpinelPS.LobbyServer.Msgs.User { [PacketPath("/User/GetProfile")] public class GetUserProfile : LobbyMsgHandler diff --git a/nksrv/LobbyServer/Msgs/User/GetUserScenarioExist.cs b/EpinelPS/LobbyServer/Msgs/User/GetUserScenarioExist.cs similarity index 93% rename from nksrv/LobbyServer/Msgs/User/GetUserScenarioExist.cs rename to EpinelPS/LobbyServer/Msgs/User/GetUserScenarioExist.cs index b47c276..9e8e06f 100644 --- a/nksrv/LobbyServer/Msgs/User/GetUserScenarioExist.cs +++ b/EpinelPS/LobbyServer/Msgs/User/GetUserScenarioExist.cs @@ -1,7 +1,7 @@ -using nksrv.Utils; +using EpinelPS.Utils; using Swan.Logging; -namespace nksrv.LobbyServer.Msgs.User +namespace EpinelPS.LobbyServer.Msgs.User { [PacketPath("/user/scenario/exist")] public class GetUserScenarioExist : LobbyMsgHandler diff --git a/nksrv/LobbyServer/Msgs/User/GetUserTitle.cs b/EpinelPS/LobbyServer/Msgs/User/GetUserTitle.cs similarity index 85% rename from nksrv/LobbyServer/Msgs/User/GetUserTitle.cs rename to EpinelPS/LobbyServer/Msgs/User/GetUserTitle.cs index 1963f6f..4386495 100644 --- a/nksrv/LobbyServer/Msgs/User/GetUserTitle.cs +++ b/EpinelPS/LobbyServer/Msgs/User/GetUserTitle.cs @@ -1,6 +1,6 @@ -using nksrv.Utils; +using EpinelPS.Utils; -namespace nksrv.LobbyServer.Msgs.User +namespace EpinelPS.LobbyServer.Msgs.User { [PacketPath("/lobby/usertitle/get")] public class GetUserTitle : LobbyMsgHandler diff --git a/nksrv/LobbyServer/Msgs/User/GetUserTitleCounter.cs b/EpinelPS/LobbyServer/Msgs/User/GetUserTitleCounter.cs similarity index 84% rename from nksrv/LobbyServer/Msgs/User/GetUserTitleCounter.cs rename to EpinelPS/LobbyServer/Msgs/User/GetUserTitleCounter.cs index f5157a2..d0dc5a9 100644 --- a/nksrv/LobbyServer/Msgs/User/GetUserTitleCounter.cs +++ b/EpinelPS/LobbyServer/Msgs/User/GetUserTitleCounter.cs @@ -1,6 +1,6 @@ -using nksrv.Utils; +using EpinelPS.Utils; -namespace nksrv.LobbyServer.Msgs.User +namespace EpinelPS.LobbyServer.Msgs.User { [PacketPath("/lobby/usertitlecounter/get")] public class GetUserTitleCounter : LobbyMsgHandler diff --git a/nksrv/LobbyServer/Msgs/User/GetWallpaper.cs b/EpinelPS/LobbyServer/Msgs/User/GetWallpaper.cs similarity index 85% rename from nksrv/LobbyServer/Msgs/User/GetWallpaper.cs rename to EpinelPS/LobbyServer/Msgs/User/GetWallpaper.cs index 94e9d04..8cdecc8 100644 --- a/nksrv/LobbyServer/Msgs/User/GetWallpaper.cs +++ b/EpinelPS/LobbyServer/Msgs/User/GetWallpaper.cs @@ -1,6 +1,6 @@ -using nksrv.Utils; +using EpinelPS.Utils; -namespace nksrv.LobbyServer.Msgs.User +namespace EpinelPS.LobbyServer.Msgs.User { [PacketPath("/User/GetWallpaper")] public class GetWallpaper : LobbyMsgHandler diff --git a/nksrv/LobbyServer/Msgs/User/GetWallpaperInventory.cs b/EpinelPS/LobbyServer/Msgs/User/GetWallpaperInventory.cs similarity index 84% rename from nksrv/LobbyServer/Msgs/User/GetWallpaperInventory.cs rename to EpinelPS/LobbyServer/Msgs/User/GetWallpaperInventory.cs index 410ce42..bf50f5c 100644 --- a/nksrv/LobbyServer/Msgs/User/GetWallpaperInventory.cs +++ b/EpinelPS/LobbyServer/Msgs/User/GetWallpaperInventory.cs @@ -1,6 +1,6 @@ -using nksrv.Utils; +using EpinelPS.Utils; -namespace nksrv.LobbyServer.Msgs.User +namespace EpinelPS.LobbyServer.Msgs.User { [PacketPath("/user/getwallpaperinventory")] public class GetWallpaperInventory : LobbyMsgHandler diff --git a/nksrv/LobbyServer/Msgs/User/ReadMail.cs b/EpinelPS/LobbyServer/Msgs/User/ReadMail.cs similarity index 82% rename from nksrv/LobbyServer/Msgs/User/ReadMail.cs rename to EpinelPS/LobbyServer/Msgs/User/ReadMail.cs index e88412e..41e9c06 100644 --- a/nksrv/LobbyServer/Msgs/User/ReadMail.cs +++ b/EpinelPS/LobbyServer/Msgs/User/ReadMail.cs @@ -1,6 +1,6 @@ -using nksrv.Utils; +using EpinelPS.Utils; -namespace nksrv.LobbyServer.Msgs.User +namespace EpinelPS.LobbyServer.Msgs.User { [PacketPath("/mail/read")] public class ReadMail : LobbyMsgHandler diff --git a/nksrv/LobbyServer/Msgs/User/SetNickname.cs b/EpinelPS/LobbyServer/Msgs/User/SetNickname.cs similarity index 88% rename from nksrv/LobbyServer/Msgs/User/SetNickname.cs rename to EpinelPS/LobbyServer/Msgs/User/SetNickname.cs index ab1138d..eaefd33 100644 --- a/nksrv/LobbyServer/Msgs/User/SetNickname.cs +++ b/EpinelPS/LobbyServer/Msgs/User/SetNickname.cs @@ -1,6 +1,6 @@ -using nksrv.Utils; +using EpinelPS.Utils; -namespace nksrv.LobbyServer.Msgs.User +namespace EpinelPS.LobbyServer.Msgs.User { [PacketPath("/user/setnickname")] public class SetNickname : LobbyMsgHandler diff --git a/nksrv/LobbyServer/Msgs/User/SetProfileData.cs b/EpinelPS/LobbyServer/Msgs/User/SetProfileData.cs similarity index 87% rename from nksrv/LobbyServer/Msgs/User/SetProfileData.cs rename to EpinelPS/LobbyServer/Msgs/User/SetProfileData.cs index f681760..267b5db 100644 --- a/nksrv/LobbyServer/Msgs/User/SetProfileData.cs +++ b/EpinelPS/LobbyServer/Msgs/User/SetProfileData.cs @@ -1,12 +1,12 @@ -using nksrv.Database; -using nksrv.Utils; +using EpinelPS.Database; +using EpinelPS.Utils; using System; using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; -namespace nksrv.LobbyServer.Msgs.User +namespace EpinelPS.LobbyServer.Msgs.User { [PacketPath("/user/setprofiledata")] public class SetProfileData : LobbyMsgHandler diff --git a/nksrv/LobbyServer/Msgs/User/SetProfileIcon.cs b/EpinelPS/LobbyServer/Msgs/User/SetProfileIcon.cs similarity index 84% rename from nksrv/LobbyServer/Msgs/User/SetProfileIcon.cs rename to EpinelPS/LobbyServer/Msgs/User/SetProfileIcon.cs index c8d3f7a..2db7c92 100644 --- a/nksrv/LobbyServer/Msgs/User/SetProfileIcon.cs +++ b/EpinelPS/LobbyServer/Msgs/User/SetProfileIcon.cs @@ -1,7 +1,7 @@ -using nksrv.Database; -using nksrv.Utils; +using EpinelPS.Database; +using EpinelPS.Utils; -namespace nksrv.LobbyServer.Msgs.User +namespace EpinelPS.LobbyServer.Msgs.User { [PacketPath("/user/setprofileicon")] public class SetProfileIcon : LobbyMsgHandler diff --git a/nksrv/LobbyServer/Msgs/User/SetProfileTeam.cs b/EpinelPS/LobbyServer/Msgs/User/SetProfileTeam.cs similarity index 92% rename from nksrv/LobbyServer/Msgs/User/SetProfileTeam.cs rename to EpinelPS/LobbyServer/Msgs/User/SetProfileTeam.cs index 492dfce..e4c67f1 100644 --- a/nksrv/LobbyServer/Msgs/User/SetProfileTeam.cs +++ b/EpinelPS/LobbyServer/Msgs/User/SetProfileTeam.cs @@ -1,12 +1,12 @@ -using nksrv.Database; -using nksrv.Utils; +using EpinelPS.Database; +using EpinelPS.Utils; using System; using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; -namespace nksrv.LobbyServer.Msgs.User +namespace EpinelPS.LobbyServer.Msgs.User { [PacketPath("/user/setprofileteam")] public class SetProfileTeam : LobbyMsgHandler diff --git a/nksrv/LobbyServer/Msgs/User/SetScenarioCompleted.cs b/EpinelPS/LobbyServer/Msgs/User/SetScenarioCompleted.cs similarity index 90% rename from nksrv/LobbyServer/Msgs/User/SetScenarioCompleted.cs rename to EpinelPS/LobbyServer/Msgs/User/SetScenarioCompleted.cs index 20301b9..f640bc8 100644 --- a/nksrv/LobbyServer/Msgs/User/SetScenarioCompleted.cs +++ b/EpinelPS/LobbyServer/Msgs/User/SetScenarioCompleted.cs @@ -1,7 +1,7 @@ -using nksrv.Database; -using nksrv.Utils; +using EpinelPS.Database; +using EpinelPS.Utils; -namespace nksrv.LobbyServer.Msgs.User +namespace EpinelPS.LobbyServer.Msgs.User { [PacketPath("/User/SetScenarioComplete")] public class SetScenarioCompleted : LobbyMsgHandler diff --git a/nksrv/LobbyServer/Msgs/User/SetWallpaper.cs b/EpinelPS/LobbyServer/Msgs/User/SetWallpaper.cs similarity index 86% rename from nksrv/LobbyServer/Msgs/User/SetWallpaper.cs rename to EpinelPS/LobbyServer/Msgs/User/SetWallpaper.cs index 88b30ba..da3ada9 100644 --- a/nksrv/LobbyServer/Msgs/User/SetWallpaper.cs +++ b/EpinelPS/LobbyServer/Msgs/User/SetWallpaper.cs @@ -1,6 +1,6 @@ -using nksrv.Utils; +using EpinelPS.Utils; -namespace nksrv.LobbyServer.Msgs.User +namespace EpinelPS.LobbyServer.Msgs.User { [PacketPath("/User/SetWallpaper")] public class SetWallpaper : LobbyMsgHandler diff --git a/nksrv/LobbyServer/Msgs/User/Tutorial/SetTutorial.cs b/EpinelPS/LobbyServer/Msgs/User/Tutorial/SetTutorial.cs similarity index 73% rename from nksrv/LobbyServer/Msgs/User/Tutorial/SetTutorial.cs rename to EpinelPS/LobbyServer/Msgs/User/Tutorial/SetTutorial.cs index 9339b86..11e6537 100644 --- a/nksrv/LobbyServer/Msgs/User/Tutorial/SetTutorial.cs +++ b/EpinelPS/LobbyServer/Msgs/User/Tutorial/SetTutorial.cs @@ -1,8 +1,8 @@ -using nksrv.Database; -using nksrv.StaticInfo; -using nksrv.Utils; +using EpinelPS.Database; +using EpinelPS.StaticInfo; +using EpinelPS.Utils; -namespace nksrv.LobbyServer.Msgs.User.Tutorial +namespace EpinelPS.LobbyServer.Msgs.User.Tutorial { [PacketPath("/tutorial/set")] public class SetTutorial : LobbyMsgHandler @@ -14,7 +14,7 @@ namespace nksrv.LobbyServer.Msgs.User.Tutorial if (!user.ClearedTutorialData.ContainsKey(req.LastClearedTid)) { - var cleared = StaticDataParser.Instance.GetTutorialDataById(req.LastClearedTid); + var cleared = GameData.Instance.GetTutorialDataById(req.LastClearedTid); cleared.id = req.LastClearedTid; user.ClearedTutorialData.Add(req.LastClearedTid, cleared); } diff --git a/nksrv/LobbyServer/Msgs/Wallet/GetWallet.cs b/EpinelPS/LobbyServer/Msgs/Wallet/GetWallet.cs similarity index 91% rename from nksrv/LobbyServer/Msgs/Wallet/GetWallet.cs rename to EpinelPS/LobbyServer/Msgs/Wallet/GetWallet.cs index d07a9a9..d32b0f6 100644 --- a/nksrv/LobbyServer/Msgs/Wallet/GetWallet.cs +++ b/EpinelPS/LobbyServer/Msgs/Wallet/GetWallet.cs @@ -1,6 +1,6 @@ -using nksrv.Utils; +using EpinelPS.Utils; -namespace nksrv.LobbyServer.Msgs.Wallet +namespace EpinelPS.LobbyServer.Msgs.Wallet { [PacketPath("/wallet/get")] public class GetWallet : LobbyMsgHandler diff --git a/nksrv/LobbyServer/Msgs/Wallet/WalletRefreshCharge.cs b/EpinelPS/LobbyServer/Msgs/Wallet/WalletRefreshCharge.cs similarity index 93% rename from nksrv/LobbyServer/Msgs/Wallet/WalletRefreshCharge.cs rename to EpinelPS/LobbyServer/Msgs/Wallet/WalletRefreshCharge.cs index eeffbbc..423edc8 100644 --- a/nksrv/LobbyServer/Msgs/Wallet/WalletRefreshCharge.cs +++ b/EpinelPS/LobbyServer/Msgs/Wallet/WalletRefreshCharge.cs @@ -1,6 +1,6 @@ -using nksrv.Utils; +using EpinelPS.Utils; -namespace nksrv.LobbyServer.Msgs.Wallet +namespace EpinelPS.LobbyServer.Msgs.Wallet { [PacketPath("/wallet/refreshcharge")] public class WalletRefreshCharge : LobbyMsgHandler diff --git a/nksrv/Program.cs b/EpinelPS/Program.cs similarity index 97% rename from nksrv/Program.cs rename to EpinelPS/Program.cs index 6ba97e1..4c2a0f7 100644 --- a/nksrv/Program.cs +++ b/EpinelPS/Program.cs @@ -2,18 +2,18 @@ using EmbedIO.Actions; using EmbedIO.WebApi; using Newtonsoft.Json; -using nksrv.Database; -using nksrv.IntlServer; -using nksrv.LobbyServer; -using nksrv.LobbyServer.Msgs.Stage; -using nksrv.StaticInfo; -using nksrv.Utils; +using EpinelPS.Database; +using EpinelPS.IntlServer; +using EpinelPS.LobbyServer; +using EpinelPS.LobbyServer.Msgs.Stage; +using EpinelPS.StaticInfo; +using EpinelPS.Utils; using Swan.Logging; using System.Net.Http.Headers; using System.Security.Cryptography.X509Certificates; using System.Text; -namespace nksrv +namespace EpinelPS { internal class Program { @@ -26,7 +26,7 @@ namespace nksrv Logger.Info("Initializing database"); JsonDb.Save(); - StaticDataParser.Instance.GetAllCostumes(); // force static data to be loaded + GameData.Instance.GetAllCostumes(); // force static data to be loaded Logger.Info("Initialize handlers"); LobbyHandler.Init(); @@ -65,7 +65,7 @@ namespace nksrv } else if (input == "?" || input == "help") { - Console.WriteLine("Nikke Private Server CLI interface"); + Console.WriteLine("EpinelPS CLI"); Console.WriteLine(); Console.WriteLine("Commands:"); Console.WriteLine(" help - show this help"); @@ -179,7 +179,7 @@ namespace nksrv { for (int i = 0; i < chapterNumber + 1; i++) { - var stages = StaticDataParser.Instance.GetStageIdsForChapter(i, true); + var stages = GameData.Instance.GetStageIdsForChapter(i, true); int target = 1; foreach (var item in stages) { @@ -233,6 +233,7 @@ namespace nksrv } } } + private static string LauncherEndpoint = Encoding.UTF8.GetString(Convert.FromBase64String("L25pa2tlX2xhdW5jaGVy")); private static WebServer CreateWebServer() { var cert = new X509Certificate2(new X509Certificate(AppDomain.CurrentDomain.BaseDirectory + @"site.pfx")); @@ -252,7 +253,7 @@ namespace nksrv .WithModule(new ActionModule("/PC/", HttpVerbs.Any, HandleAsset)) .WithModule(new ActionModule("/$batch", HttpVerbs.Any, HandleBatchRequests)) .WithModule(new ActionModule("/api/v1/", HttpVerbs.Any, IntlHandler.Handle)) - .WithStaticFolder("/nikke_launcher", Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "www", "launcher"), true) + .WithStaticFolder(LauncherEndpoint, Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "www", "launcher"), true) .WithStaticFolder("/admin/assets/", Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "www", "admin", "assets"), true) .WithModule(new ActionModule("/admin", HttpVerbs.Any, HandleAdminRequest)) .WithWebApi("/adminapi", m => m.WithController(typeof(AdminApiController))); diff --git a/nksrv/Protos/allmsgs.proto b/EpinelPS/Protos/allmsgs.proto similarity index 99% rename from nksrv/Protos/allmsgs.proto rename to EpinelPS/Protos/allmsgs.proto index ec6b0e9..de86999 100644 --- a/nksrv/Protos/allmsgs.proto +++ b/EpinelPS/Protos/allmsgs.proto @@ -1,6 +1,6 @@ syntax = "proto3"; -option csharp_namespace = "nksrv"; +option csharp_namespace = "EpinelPS"; import "google/protobuf/timestamp.proto"; import "google/protobuf/Duration.proto"; diff --git a/nksrv/Protos/intercept.proto b/EpinelPS/Protos/intercept.proto similarity index 97% rename from nksrv/Protos/intercept.proto rename to EpinelPS/Protos/intercept.proto index 4c3a1e6..bc86cc5 100644 --- a/nksrv/Protos/intercept.proto +++ b/EpinelPS/Protos/intercept.proto @@ -1,6 +1,6 @@ syntax = "proto3"; -option csharp_namespace = "nksrv.Net"; +option csharp_namespace = "EpinelPS.Net"; import "google/protobuf/timestamp.proto"; import "google/protobuf/Duration.proto"; diff --git a/nksrv/Protos/liberate.proto b/EpinelPS/Protos/liberate.proto similarity index 94% rename from nksrv/Protos/liberate.proto rename to EpinelPS/Protos/liberate.proto index 6d49de2..864b4bc 100644 --- a/nksrv/Protos/liberate.proto +++ b/EpinelPS/Protos/liberate.proto @@ -1,6 +1,6 @@ syntax = "proto3"; -option csharp_namespace = "nksrv.Net"; +option csharp_namespace = "EpinelPS.Net"; import "google/protobuf/timestamp.proto"; import "google/protobuf/Duration.proto"; diff --git a/nksrv/Protos/outpost.proto b/EpinelPS/Protos/outpost.proto similarity index 94% rename from nksrv/Protos/outpost.proto rename to EpinelPS/Protos/outpost.proto index 0fb214a..b4e81b2 100644 --- a/nksrv/Protos/outpost.proto +++ b/EpinelPS/Protos/outpost.proto @@ -1,6 +1,6 @@ syntax = "proto3"; -option csharp_namespace = "nksrv.Net"; +option csharp_namespace = "EpinelPS.Net"; import "google/protobuf/timestamp.proto"; import "google/protobuf/Duration.proto"; diff --git a/nksrv/Protos/shop.proto b/EpinelPS/Protos/shop.proto similarity index 93% rename from nksrv/Protos/shop.proto rename to EpinelPS/Protos/shop.proto index f50c590..fc761ed 100644 --- a/nksrv/Protos/shop.proto +++ b/EpinelPS/Protos/shop.proto @@ -1,6 +1,6 @@ syntax = "proto3"; -option csharp_namespace = "nksrv.Net"; +option csharp_namespace = "EpinelPS.Net"; import "google/protobuf/timestamp.proto"; import "google/protobuf/Duration.proto"; diff --git a/nksrv/Protos/sidestory.proto b/EpinelPS/Protos/sidestory.proto similarity index 97% rename from nksrv/Protos/sidestory.proto rename to EpinelPS/Protos/sidestory.proto index b7806cc..bf7eb4f 100644 --- a/nksrv/Protos/sidestory.proto +++ b/EpinelPS/Protos/sidestory.proto @@ -1,6 +1,6 @@ syntax = "proto3"; -option csharp_namespace = "nksrv.Net"; +option csharp_namespace = "EpinelPS.Net"; import "google/protobuf/timestamp.proto"; import "google/protobuf/Duration.proto"; diff --git a/nksrv/Protos/system.proto b/EpinelPS/Protos/system.proto similarity index 96% rename from nksrv/Protos/system.proto rename to EpinelPS/Protos/system.proto index 8bbfa50..b316a24 100644 --- a/nksrv/Protos/system.proto +++ b/EpinelPS/Protos/system.proto @@ -1,6 +1,6 @@ syntax = "proto3"; -option csharp_namespace = "nksrv.Net"; +option csharp_namespace = "EpinelPS.Net"; import "google/protobuf/timestamp.proto"; import "google/protobuf/Duration.proto"; diff --git a/nksrv/Utils/AssetDownloadUtil.cs b/EpinelPS/Utils/AssetDownloadUtil.cs similarity index 99% rename from nksrv/Utils/AssetDownloadUtil.cs rename to EpinelPS/Utils/AssetDownloadUtil.cs index 64ee6df..9260325 100644 --- a/nksrv/Utils/AssetDownloadUtil.cs +++ b/EpinelPS/Utils/AssetDownloadUtil.cs @@ -2,7 +2,7 @@ using Swan.Logging; using System.Net; -namespace nksrv.Utils +namespace EpinelPS.Utils { public class AssetDownloadUtil { diff --git a/nksrv/Utils/GameConfig.cs b/EpinelPS/Utils/GameConfig.cs similarity index 98% rename from nksrv/Utils/GameConfig.cs rename to EpinelPS/Utils/GameConfig.cs index b8b3a04..b162503 100644 --- a/nksrv/Utils/GameConfig.cs +++ b/EpinelPS/Utils/GameConfig.cs @@ -1,7 +1,7 @@ using Newtonsoft.Json; using Swan.Logging; -namespace nksrv.Utils +namespace EpinelPS.Utils { public class GameConfigRoot { diff --git a/nksrv/Utils/GreatLogger.cs b/EpinelPS/Utils/GreatLogger.cs similarity index 98% rename from nksrv/Utils/GreatLogger.cs rename to EpinelPS/Utils/GreatLogger.cs index a48c2f0..6736a97 100644 --- a/nksrv/Utils/GreatLogger.cs +++ b/EpinelPS/Utils/GreatLogger.cs @@ -1,6 +1,6 @@ using Swan.Logging; -namespace nksrv.Utils +namespace EpinelPS.Utils { public class GreatLogger : ILogger { diff --git a/nksrv/Utils/LoggingHttpHandler.cs b/EpinelPS/Utils/LoggingHttpHandler.cs similarity index 97% rename from nksrv/Utils/LoggingHttpHandler.cs rename to EpinelPS/Utils/LoggingHttpHandler.cs index 5ffaf58..01a6d96 100644 --- a/nksrv/Utils/LoggingHttpHandler.cs +++ b/EpinelPS/Utils/LoggingHttpHandler.cs @@ -1,4 +1,4 @@ -namespace nksrv.Utils +namespace EpinelPS.Utils { public class LoggingHttpHandler(HttpMessageHandler innerHandler) : DelegatingHandler(innerHandler) { diff --git a/nksrv/Utils/NetUtils.cs b/EpinelPS/Utils/NetUtils.cs similarity index 96% rename from nksrv/Utils/NetUtils.cs rename to EpinelPS/Utils/NetUtils.cs index d0ab6c9..28d19bd 100644 --- a/nksrv/Utils/NetUtils.cs +++ b/EpinelPS/Utils/NetUtils.cs @@ -1,8 +1,8 @@ -using nksrv.Database; -using nksrv.StaticInfo; +using EpinelPS.Database; +using EpinelPS.StaticInfo; using Swan.Logging; -namespace nksrv.Utils +namespace EpinelPS.Utils { public class NetUtils { @@ -55,7 +55,7 @@ namespace nksrv.Utils { if (item.Isn == isn) { - var subType = StaticDataParser.Instance.GetItemSubType(item.ItemType); + var subType = GameData.Instance.GetItemSubType(item.ItemType); switch (subType) { case "Module_A": diff --git a/nksrv/Utils/PacketDecryption.cs b/EpinelPS/Utils/PacketDecryption.cs similarity index 99% rename from nksrv/Utils/PacketDecryption.cs rename to EpinelPS/Utils/PacketDecryption.cs index b5755bf..d797395 100644 --- a/nksrv/Utils/PacketDecryption.cs +++ b/EpinelPS/Utils/PacketDecryption.cs @@ -1,11 +1,11 @@ using EmbedIO; -using nksrv.LobbyServer; +using EpinelPS.LobbyServer; using Sodium; using System.Buffers.Binary; using System.IO.Compression; using System.Text; -namespace nksrv.Utils +namespace EpinelPS.Utils { public class PacketDecryption { diff --git a/nksrv/Utils/PacketPathAttribute.cs b/EpinelPS/Utils/PacketPathAttribute.cs similarity index 92% rename from nksrv/Utils/PacketPathAttribute.cs rename to EpinelPS/Utils/PacketPathAttribute.cs index c08271a..62c3c86 100644 --- a/nksrv/Utils/PacketPathAttribute.cs +++ b/EpinelPS/Utils/PacketPathAttribute.cs @@ -1,4 +1,4 @@ -namespace nksrv.Utils +namespace EpinelPS.Utils { /// /// Represents that this class handles a message diff --git a/nksrv/Utils/ProgressBar.cs b/EpinelPS/Utils/ProgressBar.cs similarity index 99% rename from nksrv/Utils/ProgressBar.cs rename to EpinelPS/Utils/ProgressBar.cs index a242cfe..f491d67 100644 --- a/nksrv/Utils/ProgressBar.cs +++ b/EpinelPS/Utils/ProgressBar.cs @@ -3,7 +3,7 @@ using System.Text; -namespace nksrv.Utils +namespace EpinelPS.Utils { /// /// An ASCII progress bar diff --git a/nksrv/Utils/Rng.cs b/EpinelPS/Utils/Rng.cs similarity index 94% rename from nksrv/Utils/Rng.cs rename to EpinelPS/Utils/Rng.cs index 3fc3833..4fec5e8 100644 --- a/nksrv/Utils/Rng.cs +++ b/EpinelPS/Utils/Rng.cs @@ -1,4 +1,4 @@ -namespace nksrv.Utils +namespace EpinelPS.Utils { public class Rng { diff --git a/nksrv/gameconfig.json b/EpinelPS/gameconfig.json similarity index 100% rename from nksrv/gameconfig.json rename to EpinelPS/gameconfig.json diff --git a/nksrv/gameversion.json b/EpinelPS/gameversion.json similarity index 100% rename from nksrv/gameversion.json rename to EpinelPS/gameversion.json diff --git a/nksrv/www/admin/assets/login.css b/EpinelPS/www/admin/assets/login.css similarity index 100% rename from nksrv/www/admin/assets/login.css rename to EpinelPS/www/admin/assets/login.css diff --git a/nksrv/www/admin/assets/login.jpg b/EpinelPS/www/admin/assets/login.jpg similarity index 100% rename from nksrv/www/admin/assets/login.jpg rename to EpinelPS/www/admin/assets/login.jpg diff --git a/nksrv/www/admin/assets/style.css b/EpinelPS/www/admin/assets/style.css similarity index 100% rename from nksrv/www/admin/assets/style.css rename to EpinelPS/www/admin/assets/style.css diff --git a/nksrv/www/admin/dashbrd.html b/EpinelPS/www/admin/dashbrd.html similarity index 100% rename from nksrv/www/admin/dashbrd.html rename to EpinelPS/www/admin/dashbrd.html diff --git a/nksrv/www/admin/index.html b/EpinelPS/www/admin/index.html similarity index 100% rename from nksrv/www/admin/index.html rename to EpinelPS/www/admin/index.html diff --git a/nksrv/www/admin/nav.html b/EpinelPS/www/admin/nav.html similarity index 100% rename from nksrv/www/admin/nav.html rename to EpinelPS/www/admin/nav.html diff --git a/nksrv/www/launcher/index.html b/EpinelPS/www/launcher/index.html similarity index 100% rename from nksrv/www/launcher/index.html rename to EpinelPS/www/launcher/index.html diff --git a/README.md b/README.md index e1d3330..c96d95b 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# nikke-server +# EpinelPS --- @@ -12,34 +12,23 @@ [![Discord](https://img.shields.io/discord/1261717212448952450?style=flat-square)](https://discord.gg/Ztt6Y9vQjF) -Private/local server for Nikke. Discord server: https://discord.gg/Ztt6Y9vQjF +Private/local server for another anime game. Discord server: https://discord.gg/Ztt6Y9vQjF > [!WARNING] > This project is in a very early state so many functions in the game do not work. ## Usage -Download the latest release/GitHub actions build, and run ServerSelector.Desktop.exe as administrator (to modify DNS hosts file and install a CA cert). Make sure to close the game and launcher first. Select Local server, and then click save. After that, start nksrv.exe to start the actual server. +Download the latest release/GitHub actions build, and run ServerSelector.Desktop.exe as administrator (to modify DNS hosts file and install a CA cert). Make sure to close the game and launcher first. Select Local server, and then click save. After that, start EpinelPS.exe to start the actual server.

You should be able to register an new account in the launcher (you can enter any email verification code). -If the game does not get past the title screen, open an issue and send %appdata%\..\LocalLow\com.proximabeta\NIKKE\player.log file. - -Note that this was tested with the latest version (122.8.20c) - To access the admin panel, go to https://127.0.0.1/admin/ and sign in. Note that IsAdmin needs to be true for the user account. Note that this interface does not have anything yet. To skip stages, a basic command line interface is implemented. -## Screenshots - - - - - - ## TODO: - [X] Normal campaign @@ -73,15 +62,4 @@ To skip stages, a basic command line interface is implemented. - Mission reward, daily/weekly missions - Side quests - Lots of things in the outpost - - And a lot more... - -## Contributing -Server code structure: - -nksrv/LobbyServer: The actual server code. - -nksrv/IntlServer: Provides Launcher APIs and authentication - -nksrv/Protos: Google protobuf definition files - -DataFixupUtil: Utility to parse packets from server/client + - And a lot more... \ No newline at end of file diff --git a/nksrv/site.pfx b/nksrv/site.pfx deleted file mode 100644 index 8cf0cac998a736eef325ac908b5e4c74179118e1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2723 zcmai$S5Om*5{3y0C80^x(3Ku3fq=9i0YMR@Ns06bf+X}HMWn_62T%d&N^hYlRZ&Wi zA{~KPC`uJYKi{j;-g-z=N}DPRNu;RJ{cGZ+?U6t~9#U;z{o zAeTV|i2ez_2q%CV{*9Om380b_bh5;7(z5?e0C4o5fr$fd4439tpB~n2xek{i!g&RaYg`lAP4{hoidD;3*AB zR@c~g&I^mJlja>}WeP9cgJtkuOQGxElctwoGTmw`?k>!ctS5Whx3#6C3z8F;*26>* z_jhlfI~=(|22TG*ZQ8jPP3GB;%j6ZuyxP#nUh6j&gIw_N7ipKR?Jwmqr-vTC$L*C( z!32(qUoh~cUtEieT3G}%wgb(J^BUr9IQ}g4*uf@<1EHk-bOYT(VKt3>S z*~is7&z?2%gU_f&7)Z1&OXGLL!$q6OtaxW$a7Mw3M7d_W?~oNNV^m zbFfLTElVlNsRO+iYA>*++m%r3lCcwKm?9xd!~#7(uyce9?w58Zy?uASVnq2BL^qt`_D)gc$4aLhi#rh#*V4k{CeY`h)h>^|m@=dXkBW ztgZFV0a5vm{`C1urr@pW~85{YwsV<*J)XOX)t+GZN$^o(gwcA|-pEZOUx#<1(DG)O7DIwVK{a4?3&Zuj&QHOIQHDa(>Tbdb5 z*f3Imse7Dt?vYlt3jYJBRKIi1qc@-Z20^-pH$!byg$hHfCt|!q=I2M#yoi)MSBWv%A=_KFNVi1rZ$ze4WmrN#24OcB4X74AD}Up=bd zh@e{Ewsm#vOy-^e?jwbiq30S4jWFHV-PnCcf>t>TZ+jY4&3p03Y^NXDxpZknTkW*8 zU(vY3@P8}opKo<*@2b2%T;eU!l?>!-th&L6Ot z3(j}zFEeTYDSq1r2k&V26SsbkxvBIvux#cNtY$l zgW1`7kKJ0H$=r5jdUFxGEWNuaQ|EeS+M9d!OlJ1TkyVDg;S6U$QQ@TU_b8rkd8=?8 zNZbZFjhRfU%DQBrira_sX^X75L---SfZ?wGhLdzcP1gMYR#3 z8;xeBkZX2U0<8~)_Sk5bevw-OzdG14HJ4Vx2~5O4{`p5}OhF(5Q@{!KIVmhN+y7k0 z4goNpgvuvS;r|KD&l-d^;FiPvUx7`>e1S^Y<0*h!SJwPI``SSS(AY~Z9W%jNe!8e- zkC`tx^^M&1}$>mOF?02 z8kNU1=_HN$)LWE^8Acr1Zx+$OIuGO68f)=vxnBoop_ zTI!c7{un%$a)SzM)}C2Rgkd}Pd?3ZQZ~9;+-=*7 z0|WT>?yFAG%jg3?JUeu1O&mUyo)6mXn65JtopQt1(^)xg_mHH%Q0Ba=Y?Vmw*yoat zp^B|CN7*lt&~qjkUxmU)FX2?4`%ARSYM}aLUSo?@OCyMON+f7}WhV!71@56$G}<{C zqtGyTsKl-)sXBDGQB}obB~lorf`yM#I2yHPS2ffHRLC7zY4UnHKbmolkyE< zqnEYl8WOM#)UU=`J_1TTGAV=JRBg`R(?JaD2r~D!tPEuaNR&)8e_!Rfx~@O^*NALP zb3+2BZho52knrjlF!5s+j`K9*vBKnvK<;cZO0s6->yPWJUcqYS@7v<7#!-7Z-a!M^C1=+5% zcg>VDH(`u9nP_Z(!3fbyJn?GTm}t7?{&km zXR2vZdr#@5?ehjEK`v}RKDk)fR`5-ccklh(o1B%=K-73(d^1&K0V&W;uG+>AvGBYN zloe{aGhAl5fSs$~e>d?A?nUk2`KkG~ z>Bbg1=9~Jw4$M`+A%UcxU{Sq}o^Vyq@UMQlT)Z*xI2*a*lmCpTwLGV7NW*(y=pC}Z zIp{K?Rz-C*Y<5tMT$buFWFkms^UQ17N@oq}^G$HEZ#R5?;q}#GofkF?_FBlcWaP@Q zf?6!6&fJ6v<@7++cgK3o2*cPaFWBq`?0UY=g(GGi&pdCsELI+pyZl_;L1O3c$Ge&j zOaVXb3}Vu{QvuC_id|tHC3}($Uu-!xVIj5(aU27tnA#z=`EDDJ#H5QUW#-bZdTv8s zOq!1;eQrf;YlU}7Ru%Jkpu>8x2vPV;WhuDCAHjn8l?6b2hDnnR;AaF+Gt{q&Lq&GF z-;G5OTo0}c=lJv9F#?zvK;l`ED0i8&W_F%;n$HGIQO8H}>5|+NU1sG=&v#1Z2G4_7 QJv-&hdGcgu{!#6J0JN3<#{d8T