From 2d53217d8221b0731b044ed02ec21a5a799c2366 Mon Sep 17 00:00:00 2001 From: Somebody Date: Tue, 6 Aug 2024 20:57:20 +0800 Subject: [PATCH] Format Code & Implement Basic Food --- Command/Command.csproj | 4 - Command/Command/Cmd/CommandAvatar.cs | 2 +- Command/Command/Cmd/CommandGiveall.cs | 4 +- Command/Command/Cmd/CommandHero.cs | 2 +- Command/Command/Cmd/CommandMail.cs | 10 +- Command/Command/Cmd/CommandSetlevel.cs | 2 +- Command/Command/Cmd/CommandWindy.cs | 4 +- Common/Data/Excel/ItemUseBuffDataExcel.cs | 2 +- Common/Database/Avatar/AvatarData.cs | 2 +- Common/Database/Lineup/LineupData.cs | 27 ++++- Common/Database/Player/PlayerData.cs | 3 +- Common/Enums/Scene/PlaneTypeEnum.cs | 2 +- Common/Util/ConfigManager.cs | 1 + DanhengKcpSharp/DanhengConnection.cs | 4 - DanhengKcpSharp/HandshakePacket.cs | 5 +- .../KcpSharp/KcpRawReceiveQueue.cs | 3 +- GameServer/Command/PlayerCommandSender.cs | 2 +- GameServer/Game/Avatar/AvatarManager.cs | 2 +- GameServer/Game/Battle/BattleManager.cs | 1 + GameServer/Game/Friend/FriendManager.cs | 1 + GameServer/Game/Gacha/GachaManager.cs | 2 +- GameServer/Game/Inventory/InventoryManager.cs | 101 +++++++++++++++++- GameServer/Game/Lineup/LineupManager.cs | 4 +- GameServer/Game/Message/MessageManager.cs | 2 +- .../Handler/MissionHandlerBattleChallenge.cs | 22 ++-- .../MissionHandlerBattleWinWithCustomValue.cs | 12 ++- GameServer/Game/Mission/MissionManager.cs | 13 +-- .../Game/Mission/StoryLineEntityLoader.cs | 4 +- GameServer/Game/Mission/StoryLineManager.cs | 2 +- GameServer/Game/Player/PlayerInstance.cs | 21 ++-- GameServer/Game/Quest/QuestManager.cs | 48 ++++----- GameServer/Game/Rogue/BaseRogueInstance.cs | 2 +- .../Game/Rogue/Event/RogueEventManager.cs | 2 +- .../Rogue/Miracle/RogueMiracleInstance.cs | 2 +- GameServer/Game/Scene/SceneInstance.cs | 2 +- GameServer/GameServer.csproj | 13 ++- GameServer/Server/Connection.cs | 1 - GameServer/Server/Listener.cs | 3 +- .../HandlerTakeTrialActivityRewardCsReq.cs | 2 +- .../HandlerGetArchiveDataCsReq.cs | 4 +- .../Avatar/HandlerTakePromotionRewardCsReq.cs | 2 +- .../Avatar/HandlerUnlockSkilltreeCsReq.cs | 2 +- .../HandlerGetChatFriendHistoryCsReq.cs | 2 +- .../HandlerGetPrivateChatHistoryCsReq.cs | 4 +- .../{Friend => Chat}/HandlerSendMsgCsReq.cs | 2 +- .../HandlerChessRogueCheatRollCsReq.cs | 2 +- .../HandlerChessRogueReRollDiceCsReq.cs | 2 +- .../HandlerChessRogueSelectCellCsReq.cs | 2 +- .../HandlerEnhanceChessRogueBuffCsReq.cs | 2 +- .../HandlerContentPackageGetDataCsReq.cs | 4 +- .../HandlerGetAssistHistoryCsReq.cs | 4 +- .../HandlerGetAssistListCsReq.cs | 4 +- .../HandlerGetCurAssistCsReq.cs | 2 +- .../{Shop => Item}/HandlerComposeItemCsReq.cs | 4 +- .../HandlerDestroyItemCsReq.cs | 2 +- .../HandlerExpUpEquipmentCsReq.cs | 4 +- .../HandlerExpUpRelicCsReq.cs | 4 +- .../{Player => Item}/HandlerGetBagCsReq.cs | 4 +- .../HandlerPromoteEquipmentCsReq.cs | 2 +- .../HandlerRankUpEquipmentCsReq.cs | 2 +- .../HandlerRelicRecommendCsReq.cs | 2 +- .../{Shop => Item}/HandlerSellItemCsReq.cs | 4 +- .../Packet/Recv/Item/HandlerUseItemCsReq.cs | 17 +++ .../HandlerGetJukeboxDataCsReq.cs | 4 +- .../HandlerPlayBackGroundMusicCsReq.cs | 4 +- .../Packet/Recv/Mail/HandlerDelMailCsReq.cs | 12 +-- .../HandlerDeployRotaterCsReq.cs | 4 +- .../HandlerEnterMapRotationRegionCsReq.cs | 4 +- .../HandlerInteractChargerCsReq.cs | 4 +- .../HandlerLeaveMapRotationRegionCsReq.cs | 2 +- .../HandlerRemoveRotaterCsReq.cs | 4 +- .../HandlerFinishItemIdCsReq.cs | 4 +- .../HandlerFinishPerformSectionIdCsReq.cs | 4 +- .../HandlerFinishSectionIdCsReq.cs | 4 +- .../HandlerGetNpcMessageGroupCsReq.cs | 4 +- .../HandlerGetNpcStatusCsReq.cs | 4 +- .../HandlerGetPhoneDataCsReq.cs | 4 +- .../HandlerSelectChatBubbleCsReq.cs | 4 +- .../HandlerSelectPhoneThemeCsReq.cs | 4 +- .../Recv/Player/HandlerGetLevelRewardCsReq.cs | 2 +- .../HandlerGetLevelRewardTakenListCsReq.cs | 2 +- .../HandlerGetMultiPathAvatarInfoCsReq.cs | 4 +- .../HandlerGetSecretKeyInfoCsReq.cs | 4 +- .../HandlerGetVideoVersionKeyCsReq.cs | 4 +- .../Recv/Player/HandlerPlayerGetTokenCsReq.cs | 1 - .../Recv/Player/HandlerPlayerLoginCsReq.cs | 3 +- .../HandlerSetAvatarPathCsReq.cs | 4 +- .../Recv/Player/HandlerSetNicknameCsReq.cs | 2 +- .../Recv/Player/HandlerSetPlayerInfoCsReq.cs | 1 + .../Packet/Recv/Player/HandlerUseItemCsReq.cs | 15 --- .../HandlerGetPlayerBoardDataCsReq.cs | 4 +- .../HandlerSetAssistAvatarCsReq.cs | 4 +- .../HandlerSetDisplayAvatarCsReq.cs | 4 +- .../HandlerSetHeadIconCsReq.cs | 4 +- .../HandlerSetSignatureCsReq.cs | 4 +- .../HandlerGetRndOptionCsReq.cs | 2 +- .../HandlerFinishRogueCommonDialogueCsReq.cs | 2 +- .../HandlerGetRogueHandbookDataCsReq.cs | 4 +- ...dlerHandleRogueCommonPendingActionCsReq.cs | 2 +- ...lerSelectRogueCommonDialogueOptionCsReq.cs | 2 +- .../HandlerDoGachaInRollShopCsReq.cs | 4 +- .../HandlerGetRollShopInfoCsReq.cs | 4 +- .../HandlerSceneCastSkillCostMpCsReq.cs | 4 +- .../HandlerSceneCastSkillCsReq.cs | 4 +- .../HandlerSceneEnterStageCsReq.cs | 2 +- .../HandlerSetClientPausedCsReq.cs | 6 +- .../HandlerStartCocoonStageCsReq.cs | 2 +- .../HandlerGetStoryLineInfoCsReq.cs | 4 +- ...andlerGetFirstTalkByPerformanceNpcCsReq.cs | 4 +- .../HandlerGetFirstTalkNpcCsReq.cs | 2 +- .../HandlerGetNpcTakenRewardCsReq.cs | 4 +- .../HandlerSelectInclinationTextCsReq.cs | 4 +- .../Recv/Tutorial/HandlerGetTutorialCsReq.cs | 3 +- .../PacketGetArchiveDataScRsp.cs | 2 +- .../Avatar/PacketTakePromotionRewardScRsp.cs | 2 +- .../Challenge/PacketStartChallengeScRsp.cs | 5 +- .../PacketGetPrivateChatHistoryScRsp.cs | 2 +- .../{Friend => Chat}/PacketRevcMsgScNotify.cs | 2 +- .../PacketContentPackageGetDataScRsp.cs | 2 +- .../PacketContentPackageSyncDataScNotify.cs | 2 +- .../PacketGetAssistHistoryScRsp.cs | 2 +- .../PacketGetAssistListScRsp.cs | 2 +- .../{Shop => Item}/PacketComposeItemScRsp.cs | 2 +- .../PacketExpUpEquipmentScRsp.cs | 2 +- .../{Avatar => Item}/PacketExpUpRelicScRsp.cs | 2 +- .../{Player => Item}/PacketGetBagScRsp.cs | 2 +- .../{Shop => Item}/PacketSellItemScRsp.cs | 2 +- .../Packet/Send/Item/PacketUseItemScRsp.cs | 29 +++++ .../PacketGetJukeboxDataScRsp.cs | 2 +- .../PacketPlayBackGroundMusicScRsp.cs | 2 +- .../PacketDeployRotaterScRsp.cs | 2 +- .../PacketEnterMapRotationRegionScRsp.cs | 2 +- .../PacketInteractChargerScRsp.cs | 2 +- .../PacketRemoveRotaterScRsp.cs | 2 +- .../PacketUpdateEnergyScNotify.cs | 2 +- .../PacketFinishItemIdScRsp.cs | 2 +- .../PacketFinishPerformSectionIdScRsp.cs | 2 +- .../PacketFinishSectionIdScRsp.cs | 2 +- .../PacketGetNpcMessageGroupScRsp.cs | 2 +- .../PacketGetNpcStatusScRsp.cs | 2 +- .../Mission/PacketMissionRewardScNotify.cs | 5 +- .../Mission/PacketSubMissionRewardScNotify.cs | 7 +- .../PacketGetPhoneDataScRsp.cs | 2 +- .../PacketSelectChatBubbleScRsp.cs | 2 +- .../PacketSelectPhoneThemeScRsp.cs | 2 +- .../PacketAvatarPathChangedNotify.cs | 2 +- .../Send/Player/PacketGetLevelRewardScRsp.cs | 14 +-- .../PacketGetLevelRewardTakenListScRsp.cs | 2 +- .../PacketGetMultiPathAvatarInfoScRsp.cs | 4 +- .../PacketGetSecretKeyInfoScRsp.cs | 2 +- .../PacketGetVideoVersionKeyScRsp.cs | 2 +- .../{Others => Player}/PacketRetcodeNotify.cs | 2 +- .../PacketServerAnnounceNotify.cs | 2 +- .../PacketSetAvatarPathScRsp.cs | 2 +- .../PacketGetPlayerBoardDataScRsp.cs | 2 +- .../PacketSetAssistAvatarScRsp.cs | 2 +- .../PacketSetDisplayAvatarScRsp.cs | 2 +- .../PacketSetHeadIconScRsp.cs | 2 +- .../PacketSetSignatureScRsp.cs | 2 +- .../PacketPlayerSyncScNotify.cs | 3 +- .../PacketGetRogueHandbookDataScRsp.cs | 2 +- ...cketHandleRogueCommonPendingActionScRsp.cs | 2 +- ...ketSelectRogueCommonDialogueOptionScRsp.cs | 2 +- ...cketSyncRogueCommonActionResultScNotify.cs | 2 +- ...cketSyncRogueCommonDialogueDataScNotify.cs | 2 +- ...RogueCommonDialogueOptionFinishScNotify.cs | 2 +- ...ketSyncRogueCommonPendingActionScNotify.cs | 2 +- ...tSyncRogueCommonVirtualItemInfoScNotify.cs | 2 +- .../PacketDoGachaInRollShopScRsp.cs | 2 +- .../PacketGetRollShopInfoScRsp.cs.cs | 2 +- .../Send/Scene/PacketGetSceneMapInfoScRsp.cs | 3 +- .../PacketSceneCastSkillCostMpScRsp.cs | 2 +- .../PacketSceneCastSkillMpUpdateScNotify.cs | 2 +- .../PacketSceneCastSkillScRsp.cs | 2 +- .../PacketSceneEnterStageScRsp.cs | 2 +- .../PacketSetClientPausedScRsp.cs | 2 +- .../PacketStartCocoonStageScRsp.cs | 2 +- .../PacketChangeStoryLineFinishScNotify.cs | 2 +- .../PacketGetStoryLineInfoScRsp.cs | 2 +- .../PacketStoryLineInfoScNotify.cs | 2 +- ...PacketGetFirstTalkByPerformanceNpcScRsp.cs | 2 +- .../PacketGetNpcTakenRewardScRsp.cs | 2 +- .../PacketSelectInclinationTextScRsp.cs | 2 +- .../PacketFinishTutorialGuideScRsp.cs | 2 +- WebServer/Response/InformationResponse.cs | 2 +- 185 files changed, 456 insertions(+), 357 deletions(-) rename GameServer/Server/Packet/Recv/{Player => Archive}/HandlerGetArchiveDataCsReq.cs (69%) rename GameServer/Server/Packet/Recv/{Friend => Chat}/HandlerGetChatFriendHistoryCsReq.cs (81%) rename GameServer/Server/Packet/Recv/{Friend => Chat}/HandlerGetPrivateChatHistoryCsReq.cs (76%) rename GameServer/Server/Packet/Recv/{Friend => Chat}/HandlerSendMsgCsReq.cs (91%) rename GameServer/Server/Packet/Recv/{Rogue => ChessRogue}/HandlerChessRogueCheatRollCsReq.cs (87%) rename GameServer/Server/Packet/Recv/{Rogue => ChessRogue}/HandlerChessRogueReRollDiceCsReq.cs (84%) rename GameServer/Server/Packet/Recv/{Rogue => ChessRogue}/HandlerChessRogueSelectCellCsReq.cs (87%) rename GameServer/Server/Packet/Recv/{Rogue => ChessRogue}/HandlerEnhanceChessRogueBuffCsReq.cs (90%) rename GameServer/Server/Packet/Recv/{Scene => ContentPackage}/HandlerContentPackageGetDataCsReq.cs (76%) rename GameServer/Server/Packet/Recv/{Avatar => Friend}/HandlerGetAssistHistoryCsReq.cs (69%) rename GameServer/Server/Packet/Recv/{Avatar => Friend}/HandlerGetAssistListCsReq.cs (67%) rename GameServer/Server/Packet/Recv/{Avatar => Friend}/HandlerGetCurAssistCsReq.cs (80%) rename GameServer/Server/Packet/Recv/{Shop => Item}/HandlerComposeItemCsReq.cs (83%) rename GameServer/Server/Packet/Recv/{Player => Item}/HandlerDestroyItemCsReq.cs (87%) rename GameServer/Server/Packet/Recv/{Avatar => Item}/HandlerExpUpEquipmentCsReq.cs (80%) rename GameServer/Server/Packet/Recv/{Avatar => Item}/HandlerExpUpRelicCsReq.cs (78%) rename GameServer/Server/Packet/Recv/{Player => Item}/HandlerGetBagCsReq.cs (67%) rename GameServer/Server/Packet/Recv/{Avatar => Item}/HandlerPromoteEquipmentCsReq.cs (87%) rename GameServer/Server/Packet/Recv/{Avatar => Item}/HandlerRankUpEquipmentCsReq.cs (87%) rename GameServer/Server/Packet/Recv/{Player => Item}/HandlerRelicRecommendCsReq.cs (80%) rename GameServer/Server/Packet/Recv/{Shop => Item}/HandlerSellItemCsReq.cs (77%) create mode 100644 GameServer/Server/Packet/Recv/Item/HandlerUseItemCsReq.cs rename GameServer/Server/Packet/Recv/{Player => JukeBox}/HandlerGetJukeboxDataCsReq.cs (69%) rename GameServer/Server/Packet/Recv/{Player => JukeBox}/HandlerPlayBackGroundMusicCsReq.cs (77%) rename GameServer/Server/Packet/Recv/{Player => MapRotation}/HandlerDeployRotaterCsReq.cs (76%) rename GameServer/Server/Packet/Recv/{Scene => MapRotation}/HandlerEnterMapRotationRegionCsReq.cs (74%) rename GameServer/Server/Packet/Recv/{Player => MapRotation}/HandlerInteractChargerCsReq.cs (79%) rename GameServer/Server/Packet/Recv/{Scene => MapRotation}/HandlerLeaveMapRotationRegionCsReq.cs (81%) rename GameServer/Server/Packet/Recv/{Player => MapRotation}/HandlerRemoveRotaterCsReq.cs (73%) rename GameServer/Server/Packet/Recv/{Mission => Message}/HandlerFinishItemIdCsReq.cs (78%) rename GameServer/Server/Packet/Recv/{Mission => Message}/HandlerFinishPerformSectionIdCsReq.cs (78%) rename GameServer/Server/Packet/Recv/{Mission => Message}/HandlerFinishSectionIdCsReq.cs (77%) rename GameServer/Server/Packet/Recv/{Mission => Message}/HandlerGetNpcMessageGroupCsReq.cs (76%) rename GameServer/Server/Packet/Recv/{Mission => Message}/HandlerGetNpcStatusCsReq.cs (68%) rename GameServer/Server/Packet/Recv/{Player => Phone}/HandlerGetPhoneDataCsReq.cs (69%) rename GameServer/Server/Packet/Recv/{Player => Phone}/HandlerSelectChatBubbleCsReq.cs (81%) rename GameServer/Server/Packet/Recv/{Player => Phone}/HandlerSelectPhoneThemeCsReq.cs (81%) rename GameServer/Server/Packet/Recv/{Avatar => Player}/HandlerGetMultiPathAvatarInfoCsReq.cs (76%) rename GameServer/Server/Packet/Recv/{Others => Player}/HandlerGetSecretKeyInfoCsReq.cs (68%) rename GameServer/Server/Packet/Recv/{Others => Player}/HandlerGetVideoVersionKeyCsReq.cs (69%) rename GameServer/Server/Packet/Recv/{Avatar => Player}/HandlerSetAvatarPathCsReq.cs (89%) delete mode 100644 GameServer/Server/Packet/Recv/Player/HandlerUseItemCsReq.cs rename GameServer/Server/Packet/Recv/{Player => PlayerBoard}/HandlerGetPlayerBoardDataCsReq.cs (95%) rename GameServer/Server/Packet/Recv/{Avatar => PlayerBoard}/HandlerSetAssistAvatarCsReq.cs (82%) rename GameServer/Server/Packet/Recv/{Avatar => PlayerBoard}/HandlerSetDisplayAvatarCsReq.cs (82%) rename GameServer/Server/Packet/Recv/{Player => PlayerBoard}/HandlerSetHeadIconCsReq.cs (96%) rename GameServer/Server/Packet/Recv/{Player => PlayerBoard}/HandlerSetSignatureCsReq.cs (96%) rename GameServer/Server/Packet/Recv/{Mission => RndOption}/HandlerGetRndOptionCsReq.cs (79%) rename GameServer/Server/Packet/Recv/{Rogue => RogueCommon}/HandlerFinishRogueCommonDialogueCsReq.cs (98%) rename GameServer/Server/Packet/Recv/{Rogue => RogueCommon}/HandlerGetRogueHandbookDataCsReq.cs (95%) rename GameServer/Server/Packet/Recv/{Rogue => RogueCommon}/HandlerHandleRogueCommonPendingActionCsReq.cs (98%) rename GameServer/Server/Packet/Recv/{Rogue => RogueCommon}/HandlerSelectRogueCommonDialogueOptionCsReq.cs (98%) rename GameServer/Server/Packet/Recv/{Shop => RollShop}/HandlerDoGachaInRollShopCsReq.cs (94%) rename GameServer/Server/Packet/Recv/{Shop => RollShop}/HandlerGetRollShopInfoCsReq.cs (74%) rename GameServer/Server/Packet/Recv/{Lineup => Scene}/HandlerSceneCastSkillCostMpCsReq.cs (79%) rename GameServer/Server/Packet/Recv/{Battle => Scene}/HandlerSceneCastSkillCsReq.cs (94%) rename GameServer/Server/Packet/Recv/{Battle => Scene}/HandlerSceneEnterStageCsReq.cs (86%) rename GameServer/Server/Packet/Recv/{Player => Scene}/HandlerSetClientPausedCsReq.cs (75%) rename GameServer/Server/Packet/Recv/{Battle => Scene}/HandlerStartCocoonStageCsReq.cs (86%) rename GameServer/Server/Packet/Recv/{Mission => StoryLine}/HandlerGetStoryLineInfoCsReq.cs (68%) rename GameServer/Server/Packet/Recv/{Scene => TalkEvent}/HandlerGetFirstTalkByPerformanceNpcCsReq.cs (75%) rename GameServer/Server/Packet/Recv/{Mission => TalkEvent}/HandlerGetFirstTalkNpcCsReq.cs (80%) rename GameServer/Server/Packet/Recv/{Scene => TalkEvent}/HandlerGetNpcTakenRewardCsReq.cs (74%) rename GameServer/Server/Packet/Recv/{Mission => TalkEvent}/HandlerSelectInclinationTextCsReq.cs (75%) rename GameServer/Server/Packet/Send/{Player => Archive}/PacketGetArchiveDataScRsp.cs (95%) rename GameServer/Server/Packet/Send/{Friend => Chat}/PacketGetPrivateChatHistoryScRsp.cs (89%) rename GameServer/Server/Packet/Send/{Friend => Chat}/PacketRevcMsgScNotify.cs (92%) rename GameServer/Server/Packet/Send/{Scene => ContentPackage}/PacketContentPackageGetDataScRsp.cs (90%) rename GameServer/Server/Packet/Send/{Scene => ContentPackage}/PacketContentPackageSyncDataScNotify.cs (90%) rename GameServer/Server/Packet/Send/{Avatar => Friend}/PacketGetAssistHistoryScRsp.cs (83%) rename GameServer/Server/Packet/Send/{Avatar => Friend}/PacketGetAssistListScRsp.cs (80%) rename GameServer/Server/Packet/Send/{Shop => Item}/PacketComposeItemScRsp.cs (91%) rename GameServer/Server/Packet/Send/{Avatar => Item}/PacketExpUpEquipmentScRsp.cs (86%) rename GameServer/Server/Packet/Send/{Avatar => Item}/PacketExpUpRelicScRsp.cs (85%) rename GameServer/Server/Packet/Send/{Player => Item}/PacketGetBagScRsp.cs (91%) rename GameServer/Server/Packet/Send/{Shop => Item}/PacketSellItemScRsp.cs (87%) create mode 100644 GameServer/Server/Packet/Send/Item/PacketUseItemScRsp.cs rename GameServer/Server/Packet/Send/{Player => JukeBox}/PacketGetJukeboxDataScRsp.cs (91%) rename GameServer/Server/Packet/Send/{Player => JukeBox}/PacketPlayBackGroundMusicScRsp.cs (85%) rename GameServer/Server/Packet/Send/{Player => MapRotation}/PacketDeployRotaterScRsp.cs (87%) rename GameServer/Server/Packet/Send/{Scene => MapRotation}/PacketEnterMapRotationRegionScRsp.cs (87%) rename GameServer/Server/Packet/Send/{Player => MapRotation}/PacketInteractChargerScRsp.cs (83%) rename GameServer/Server/Packet/Send/{Player => MapRotation}/PacketRemoveRotaterScRsp.cs (88%) rename GameServer/Server/Packet/Send/{Player => MapRotation}/PacketUpdateEnergyScNotify.cs (86%) rename GameServer/Server/Packet/Send/{Mission => Message}/PacketFinishItemIdScRsp.cs (82%) rename GameServer/Server/Packet/Send/{Mission => Message}/PacketFinishPerformSectionIdScRsp.cs (84%) rename GameServer/Server/Packet/Send/{Mission => Message}/PacketFinishSectionIdScRsp.cs (83%) rename GameServer/Server/Packet/Send/{Mission => Message}/PacketGetNpcMessageGroupScRsp.cs (89%) rename GameServer/Server/Packet/Send/{Mission => Message}/PacketGetNpcStatusScRsp.cs (90%) rename GameServer/Server/Packet/Send/{Player => Phone}/PacketGetPhoneDataScRsp.cs (92%) rename GameServer/Server/Packet/Send/{Player => Phone}/PacketSelectChatBubbleScRsp.cs (83%) rename GameServer/Server/Packet/Send/{Player => Phone}/PacketSelectPhoneThemeScRsp.cs (83%) rename GameServer/Server/Packet/Send/{Avatar => Player}/PacketAvatarPathChangedNotify.cs (86%) rename GameServer/Server/Packet/Send/{Avatar => Player}/PacketGetMultiPathAvatarInfoScRsp.cs (90%) rename GameServer/Server/Packet/Send/{Others => Player}/PacketGetSecretKeyInfoScRsp.cs (86%) rename GameServer/Server/Packet/Send/{Others => Player}/PacketGetVideoVersionKeyScRsp.cs (97%) rename GameServer/Server/Packet/Send/{Others => Player}/PacketRetcodeNotify.cs (84%) rename GameServer/Server/Packet/Send/{Others => Player}/PacketServerAnnounceNotify.cs (90%) rename GameServer/Server/Packet/Send/{Avatar => Player}/PacketSetAvatarPathScRsp.cs (83%) rename GameServer/Server/Packet/Send/{Player => PlayerBoard}/PacketGetPlayerBoardDataScRsp.cs (99%) rename GameServer/Server/Packet/Send/{Avatar => PlayerBoard}/PacketSetAssistAvatarScRsp.cs (84%) rename GameServer/Server/Packet/Send/{Avatar => PlayerBoard}/PacketSetDisplayAvatarScRsp.cs (84%) rename GameServer/Server/Packet/Send/{Player => PlayerBoard}/PacketSetHeadIconScRsp.cs (97%) rename GameServer/Server/Packet/Send/{Player => PlayerBoard}/PacketSetSignatureScRsp.cs (97%) rename GameServer/Server/Packet/Send/{Player => PlayerSync}/PacketPlayerSyncScNotify.cs (99%) rename GameServer/Server/Packet/Send/{Rogue => RogueCommon}/PacketGetRogueHandbookDataScRsp.cs (99%) rename GameServer/Server/Packet/Send/{Rogue => RogueCommon}/PacketHandleRogueCommonPendingActionScRsp.cs (99%) rename GameServer/Server/Packet/Send/{Rogue => RogueCommon}/PacketSelectRogueCommonDialogueOptionScRsp.cs (98%) rename GameServer/Server/Packet/Send/{Rogue => RogueCommon}/PacketSyncRogueCommonActionResultScNotify.cs (99%) rename GameServer/Server/Packet/Send/{Rogue => RogueCommon}/PacketSyncRogueCommonDialogueDataScNotify.cs (98%) rename GameServer/Server/Packet/Send/{Rogue => RogueCommon}/PacketSyncRogueCommonDialogueOptionFinishScNotify.cs (98%) rename GameServer/Server/Packet/Send/{Rogue => RogueCommon}/PacketSyncRogueCommonPendingActionScNotify.cs (98%) rename GameServer/Server/Packet/Send/{Rogue => RogueCommon}/PacketSyncRogueCommonVirtualItemInfoScNotify.cs (98%) rename GameServer/Server/Packet/Send/{Shop => RollShop}/PacketDoGachaInRollShopScRsp.cs (87%) rename GameServer/Server/Packet/Send/{Shop => RollShop}/PacketGetRollShopInfoScRsp.cs.cs (91%) rename GameServer/Server/Packet/Send/{Lineup => Scene}/PacketSceneCastSkillCostMpScRsp.cs (84%) rename GameServer/Server/Packet/Send/{Lineup => Scene}/PacketSceneCastSkillMpUpdateScNotify.cs (86%) rename GameServer/Server/Packet/Send/{Battle => Scene}/PacketSceneCastSkillScRsp.cs (91%) rename GameServer/Server/Packet/Send/{Battle => Scene}/PacketSceneEnterStageScRsp.cs (90%) rename GameServer/Server/Packet/Send/{Player => Scene}/PacketSetClientPausedScRsp.cs (83%) rename GameServer/Server/Packet/Send/{Battle => Scene}/PacketStartCocoonStageScRsp.cs (91%) rename GameServer/Server/Packet/Send/{Mission => StoryLine}/PacketChangeStoryLineFinishScNotify.cs (86%) rename GameServer/Server/Packet/Send/{Mission => StoryLine}/PacketGetStoryLineInfoScRsp.cs (89%) rename GameServer/Server/Packet/Send/{Mission => StoryLine}/PacketStoryLineInfoScNotify.cs (94%) rename GameServer/Server/Packet/Send/{Scene => TalkEvent}/PacketGetFirstTalkByPerformanceNpcScRsp.cs (88%) rename GameServer/Server/Packet/Send/{Scene => TalkEvent}/PacketGetNpcTakenRewardScRsp.cs (82%) rename GameServer/Server/Packet/Send/{Mission => TalkEvent}/PacketSelectInclinationTextScRsp.cs (83%) diff --git a/Command/Command.csproj b/Command/Command.csproj index 08e4c5ed..ceaec035 100644 --- a/Command/Command.csproj +++ b/Command/Command.csproj @@ -8,10 +8,6 @@ DanhengCommand - - - - diff --git a/Command/Command/Cmd/CommandAvatar.cs b/Command/Command/Cmd/CommandAvatar.cs index bc2422b4..769100c6 100644 --- a/Command/Command/Cmd/CommandAvatar.cs +++ b/Command/Command/Cmd/CommandAvatar.cs @@ -1,7 +1,7 @@ using EggLink.DanhengServer.Data; using EggLink.DanhengServer.Enums.Avatar; -using EggLink.DanhengServer.GameServer.Server.Packet.Send.Avatar; using EggLink.DanhengServer.GameServer.Server.Packet.Send.Player; +using EggLink.DanhengServer.GameServer.Server.Packet.Send.PlayerSync; using EggLink.DanhengServer.Internationalization; using EggLink.DanhengServer.Proto; diff --git a/Command/Command/Cmd/CommandGiveall.cs b/Command/Command/Cmd/CommandGiveall.cs index 150d4f15..31604a1e 100644 --- a/Command/Command/Cmd/CommandGiveall.cs +++ b/Command/Command/Cmd/CommandGiveall.cs @@ -2,7 +2,7 @@ using EggLink.DanhengServer.Database.Inventory; using EggLink.DanhengServer.Enums.Avatar; using EggLink.DanhengServer.Enums.Item; -using EggLink.DanhengServer.GameServer.Server.Packet.Send.Player; +using EggLink.DanhengServer.GameServer.Server.Packet.Send.PlayerSync; using EggLink.DanhengServer.Internationalization; namespace EggLink.DanhengServer.Command.Command.Cmd; @@ -126,7 +126,7 @@ public class CommandGiveall : ICommand var materialList = GameData.ItemConfigData.Values; var items = new List(); foreach (var material in materialList) - if (material.ItemMainType == ItemMainTypeEnum.Material) + if (material.ItemMainType == ItemMainTypeEnum.Material || material.ItemSubType == ItemSubTypeEnum.Food) items.Add(new ItemData { ItemId = material.ID, diff --git a/Command/Command/Cmd/CommandHero.cs b/Command/Command/Cmd/CommandHero.cs index f2335503..fec51714 100644 --- a/Command/Command/Cmd/CommandHero.cs +++ b/Command/Command/Cmd/CommandHero.cs @@ -1,5 +1,5 @@ using EggLink.DanhengServer.Enums.Avatar; -using EggLink.DanhengServer.GameServer.Server.Packet.Send.Avatar; +using EggLink.DanhengServer.GameServer.Server.Packet.Send.Player; using EggLink.DanhengServer.Internationalization; using EggLink.DanhengServer.Proto; diff --git a/Command/Command/Cmd/CommandMail.cs b/Command/Command/Cmd/CommandMail.cs index dfa3335c..2a435add 100644 --- a/Command/Command/Cmd/CommandMail.cs +++ b/Command/Command/Cmd/CommandMail.cs @@ -49,16 +49,10 @@ public class CommandMail : ICommand continue; } - if (flagTitle && !flagContent) - { - title += text + " "; - } + if (flagTitle && !flagContent) title += text + " "; - if (flagTitle && flagContent) - { - content += text + " "; - } + if (flagTitle && flagContent) content += text + " "; } content = content[..^1]; diff --git a/Command/Command/Cmd/CommandSetlevel.cs b/Command/Command/Cmd/CommandSetlevel.cs index 680974d8..2bc32fb3 100644 --- a/Command/Command/Cmd/CommandSetlevel.cs +++ b/Command/Command/Cmd/CommandSetlevel.cs @@ -1,6 +1,6 @@ using EggLink.DanhengServer.Data; using EggLink.DanhengServer.Database; -using EggLink.DanhengServer.GameServer.Server.Packet.Send.Player; +using EggLink.DanhengServer.GameServer.Server.Packet.Send.PlayerSync; using EggLink.DanhengServer.Internationalization; namespace EggLink.DanhengServer.Command.Command.Cmd; diff --git a/Command/Command/Cmd/CommandWindy.cs b/Command/Command/Cmd/CommandWindy.cs index 86633fd1..97618b42 100644 --- a/Command/Command/Cmd/CommandWindy.cs +++ b/Command/Command/Cmd/CommandWindy.cs @@ -1,5 +1,5 @@ -using EggLink.DanhengServer.GameServer.Server.Packet.Send.Others; -using EggLink.DanhengServer.Internationalization; +using EggLink.DanhengServer.Internationalization; +using EggLink.DanhengServer.Kcp; namespace EggLink.DanhengServer.Command.Command.Cmd; diff --git a/Common/Data/Excel/ItemUseBuffDataExcel.cs b/Common/Data/Excel/ItemUseBuffDataExcel.cs index 4b2f4d1e..2b900a23 100644 --- a/Common/Data/Excel/ItemUseBuffDataExcel.cs +++ b/Common/Data/Excel/ItemUseBuffDataExcel.cs @@ -20,4 +20,4 @@ public class ItemUseBuffDataExcel : ExcelResource { GameData.ItemUseBuffDataData.TryAdd(UseDataID, this); } -} +} \ No newline at end of file diff --git a/Common/Database/Avatar/AvatarData.cs b/Common/Database/Avatar/AvatarData.cs index eaab0355..a4502914 100644 --- a/Common/Database/Avatar/AvatarData.cs +++ b/Common/Database/Avatar/AvatarData.cs @@ -170,7 +170,7 @@ public class AvatarInfo if (pathId == 0 && AvatarId == 1001) { PathId = 1001; - pathId = 1001; // march 7th + pathId = 1001; // march 7th } var value = SkillTree; diff --git a/Common/Database/Lineup/LineupData.cs b/Common/Database/Lineup/LineupData.cs index 9ebdb0e9..d0b7e2cf 100644 --- a/Common/Database/Lineup/LineupData.cs +++ b/Common/Database/Lineup/LineupData.cs @@ -49,8 +49,9 @@ public class LineupInfo if (avatarInfo != null) { if (avatarInfo.GetCurHp(IsExtraLineup()) <= 0 && !allowRevive) continue; - if (avatarInfo.GetCurHp(IsExtraLineup()) >= 10000) continue; - avatarInfo.SetCurHp(Math.Min(avatarInfo.GetCurHp(IsExtraLineup()) + count, 10000), IsExtraLineup()); + if (avatarInfo.GetCurHp(IsExtraLineup()) >= 10000 && count > 0) continue; // full hp + if (avatarInfo.GetCurHp(IsExtraLineup()) <= 0 && count < 0) continue; // dead + avatarInfo.SetCurHp(Math.Max(Math.Min(avatarInfo.GetCurHp(IsExtraLineup()) + count, 10000), 0), IsExtraLineup()); result = true; } } @@ -84,6 +85,28 @@ public class LineupInfo return result; } + public bool AddPercentSp(int count) + { + var result = false; + if (BaseAvatars != null && AvatarData != null) + { + foreach (var avatar in BaseAvatars) + { + var avatarInfo = AvatarData?.Avatars?.Find(item => item.GetAvatarId() == avatar.BaseAvatarId); + if (avatarInfo != null) + { + if (avatarInfo.CurrentHp <= 0) continue; + avatarInfo.SetCurSp((int)Math.Min(avatarInfo.GetCurSp(IsExtraLineup()) + count, 10000), IsExtraLineup()); + result = true; + } + } + + DatabaseHelper.Instance?.UpdateInstance(AvatarData!); + } + + return result; + } + public bool IsExtraLineup() { return LineupType != 0; diff --git a/Common/Database/Player/PlayerData.cs b/Common/Database/Player/PlayerData.cs index bd434118..81627783 100644 --- a/Common/Database/Player/PlayerData.cs +++ b/Common/Database/Player/PlayerData.cs @@ -45,8 +45,7 @@ public class PlayerData : BaseDatabaseDataHelper [SugarColumn(IsNullable = true)] public long LastActiveTime { get; set; } - [SugarColumn(IsJson = true)] - public List TakenLevelReward { get; set; } = []; + [SugarColumn(IsJson = true)] public List TakenLevelReward { get; set; } = []; public static PlayerData? GetPlayerByUid(long uid) { diff --git a/Common/Enums/Scene/PlaneTypeEnum.cs b/Common/Enums/Scene/PlaneTypeEnum.cs index e32a0070..292fcb3c 100644 --- a/Common/Enums/Scene/PlaneTypeEnum.cs +++ b/Common/Enums/Scene/PlaneTypeEnum.cs @@ -10,5 +10,5 @@ public enum PlaneTypeEnum Rogue = GameModeTypeEnum.RogueExplore, Raid = GameModeTypeEnum.Raid, AetherDivide = GameModeTypeEnum.AetherDivide, - TrialActivity = GameModeTypeEnum.TrialActivity, + TrialActivity = GameModeTypeEnum.TrialActivity } \ No newline at end of file diff --git a/Common/Util/ConfigManager.cs b/Common/Util/ConfigManager.cs index 4d33bd77..6377c756 100644 --- a/Common/Util/ConfigManager.cs +++ b/Common/Util/ConfigManager.cs @@ -19,6 +19,7 @@ public static class ConfigManager logger.Info("Muipserver Admin key: " + Config.MuipServer.AdminKey); SaveConfig(); } + using var reader = new StreamReader(file.OpenRead()); var json = reader.ReadToEnd(); Config = JsonConvert.DeserializeObject(json)!; diff --git a/DanhengKcpSharp/DanhengConnection.cs b/DanhengKcpSharp/DanhengConnection.cs index ad782e80..16231e18 100644 --- a/DanhengKcpSharp/DanhengConnection.cs +++ b/DanhengKcpSharp/DanhengConnection.cs @@ -1,13 +1,9 @@ using System.Net; using System.Reflection; -using EggLink.DanhengServer.Enums; -using EggLink.DanhengServer.GameServer.Server.Packet.Send.Others; using EggLink.DanhengServer.Kcp.KcpSharp; -using EggLink.DanhengServer.Proto; using EggLink.DanhengServer.Util; using Google.Protobuf; using Google.Protobuf.Reflection; -using static Microsoft.EntityFrameworkCore.DbLoggerCategory.Database; namespace EggLink.DanhengServer.Kcp; diff --git a/DanhengKcpSharp/HandshakePacket.cs b/DanhengKcpSharp/HandshakePacket.cs index 76b789ad..8d42192d 100644 --- a/DanhengKcpSharp/HandshakePacket.cs +++ b/DanhengKcpSharp/HandshakePacket.cs @@ -1,8 +1,7 @@ -using EggLink.DanhengServer.Kcp; -using EggLink.DanhengServer.Proto; +using EggLink.DanhengServer.Proto; using Google.Protobuf; -namespace EggLink.DanhengServer.GameServer.Server.Packet.Send.Others; +namespace EggLink.DanhengServer.Kcp; public class HandshakePacket : BasePacket { diff --git a/DanhengKcpSharp/KcpSharp/KcpRawReceiveQueue.cs b/DanhengKcpSharp/KcpSharp/KcpRawReceiveQueue.cs index 2d4f837a..2e0e50a3 100644 --- a/DanhengKcpSharp/KcpSharp/KcpRawReceiveQueue.cs +++ b/DanhengKcpSharp/KcpSharp/KcpRawReceiveQueue.cs @@ -2,8 +2,7 @@ using LinkedListOfQueueItem = KcpSharp.NetstandardShim.LinkedList; using LinkedListNodeOfQueueItem = KcpSharp.NetstandardShim.LinkedListNode; #else -using LinkedListOfQueueItem = - System.Collections.Generic.LinkedList; +using LinkedListOfQueueItem = System.Collections.Generic.LinkedList; using LinkedListNodeOfQueueItem = System.Collections.Generic.LinkedListNode; #endif diff --git a/GameServer/Command/PlayerCommandSender.cs b/GameServer/Command/PlayerCommandSender.cs index 990710bb..c3e9cf04 100644 --- a/GameServer/Command/PlayerCommandSender.cs +++ b/GameServer/Command/PlayerCommandSender.cs @@ -2,7 +2,7 @@ using EggLink.DanhengServer.Database; using EggLink.DanhengServer.Database.Account; using EggLink.DanhengServer.GameServer.Game.Player; -using EggLink.DanhengServer.GameServer.Server.Packet.Send.Friend; +using EggLink.DanhengServer.GameServer.Server.Packet.Send.Chat; using EggLink.DanhengServer.Util; namespace EggLink.DanhengServer.GameServer.Command; diff --git a/GameServer/Game/Avatar/AvatarManager.cs b/GameServer/Game/Avatar/AvatarManager.cs index 1c4d6a7d..91459723 100644 --- a/GameServer/Game/Avatar/AvatarManager.cs +++ b/GameServer/Game/Avatar/AvatarManager.cs @@ -4,7 +4,7 @@ using EggLink.DanhengServer.Database; using EggLink.DanhengServer.Database.Avatar; using EggLink.DanhengServer.GameServer.Game.Player; using EggLink.DanhengServer.GameServer.Server.Packet.Send.Avatar; -using EggLink.DanhengServer.GameServer.Server.Packet.Send.Player; +using EggLink.DanhengServer.GameServer.Server.Packet.Send.PlayerSync; using EggLink.DanhengServer.Util; namespace EggLink.DanhengServer.GameServer.Game.Avatar; diff --git a/GameServer/Game/Battle/BattleManager.cs b/GameServer/Game/Battle/BattleManager.cs index 070f5f3d..34f1090c 100644 --- a/GameServer/Game/Battle/BattleManager.cs +++ b/GameServer/Game/Battle/BattleManager.cs @@ -8,6 +8,7 @@ using EggLink.DanhengServer.GameServer.Game.Scene; using EggLink.DanhengServer.GameServer.Game.Scene.Entity; using EggLink.DanhengServer.GameServer.Server.Packet.Send.Battle; using EggLink.DanhengServer.GameServer.Server.Packet.Send.Lineup; +using EggLink.DanhengServer.GameServer.Server.Packet.Send.Scene; using EggLink.DanhengServer.Proto; using EggLink.DanhengServer.Util; diff --git a/GameServer/Game/Friend/FriendManager.cs b/GameServer/Game/Friend/FriendManager.cs index da231d35..19bbb895 100644 --- a/GameServer/Game/Friend/FriendManager.cs +++ b/GameServer/Game/Friend/FriendManager.cs @@ -4,6 +4,7 @@ using EggLink.DanhengServer.Database.Player; using EggLink.DanhengServer.GameServer.Command; using EggLink.DanhengServer.GameServer.Game.Player; using EggLink.DanhengServer.GameServer.Server; +using EggLink.DanhengServer.GameServer.Server.Packet.Send.Chat; using EggLink.DanhengServer.GameServer.Server.Packet.Send.Friend; using EggLink.DanhengServer.Proto; using EggLink.DanhengServer.Util; diff --git a/GameServer/Game/Gacha/GachaManager.cs b/GameServer/Game/Gacha/GachaManager.cs index 7d4ebb8d..6d2fc00c 100644 --- a/GameServer/Game/Gacha/GachaManager.cs +++ b/GameServer/Game/Gacha/GachaManager.cs @@ -5,7 +5,7 @@ using EggLink.DanhengServer.Database.Inventory; using EggLink.DanhengServer.Enums; using EggLink.DanhengServer.Enums.Item; using EggLink.DanhengServer.GameServer.Game.Player; -using EggLink.DanhengServer.GameServer.Server.Packet.Send.Player; +using EggLink.DanhengServer.GameServer.Server.Packet.Send.PlayerSync; using EggLink.DanhengServer.Proto; using GachaInfo = EggLink.DanhengServer.Database.Gacha.GachaInfo; diff --git a/GameServer/Game/Inventory/InventoryManager.cs b/GameServer/Game/Inventory/InventoryManager.cs index 226f5455..e60e3f48 100644 --- a/GameServer/Game/Inventory/InventoryManager.cs +++ b/GameServer/Game/Inventory/InventoryManager.cs @@ -4,8 +4,10 @@ using EggLink.DanhengServer.Database.Inventory; using EggLink.DanhengServer.Enums.Item; using EggLink.DanhengServer.Enums.Mission; using EggLink.DanhengServer.GameServer.Game.Player; -using EggLink.DanhengServer.GameServer.Server.Packet.Send.Others; +using EggLink.DanhengServer.GameServer.Game.Scene; +using EggLink.DanhengServer.GameServer.Server.Packet.Send.Lineup; using EggLink.DanhengServer.GameServer.Server.Packet.Send.Player; +using EggLink.DanhengServer.GameServer.Server.Packet.Send.PlayerSync; using EggLink.DanhengServer.GameServer.Server.Packet.Send.Scene; using EggLink.DanhengServer.Proto; using EggLink.DanhengServer.Util; @@ -406,13 +408,13 @@ public class InventoryManager(PlayerInstance player) : BasePlayerManager(player) foreach (var item in rewardData.GetItems()) { - var i = await AddItem(item.Item1, item.Item2, notify, sync:false); + var i = await AddItem(item.Item1, item.Item2, notify, sync: false); if (i != null) items.Add(i); } await Player.SendPacket(new PacketPlayerSyncScNotify(items)); - var hCoin = await AddItem(1, rewardData.Hcoin, notify, sync:false); + var hCoin = await AddItem(1, rewardData.Hcoin, notify, sync: false); if (hCoin != null) items.Add(hCoin); @@ -550,6 +552,99 @@ public class InventoryManager(PlayerInstance player) : BasePlayerManager(player) return items; } + public async ValueTask<(Retcode, List? returnItems)> UseItem(int itemId, int count = 1, int baseAvatarId = 0) + { + GameData.ItemConfigData.TryGetValue(itemId, out var itemConfig); + if (itemConfig == null) return (Retcode.RetItemNotExist, null); + var dataId = itemConfig.UseDataID; + GameData.ItemUseBuffDataData.TryGetValue(dataId, out var useConfig); + if (useConfig == null) return (Retcode.RetItemUseConfigNotExist, null); + + for (int i = 0; i < count; i++) // do count times + { + if (useConfig.PreviewSkillPoint != 0) + { + await Player.LineupManager!.GainMp((int)useConfig.PreviewSkillPoint); + } + + if (baseAvatarId > 0) + { + // single use + var avatar = Player.AvatarManager!.GetAvatar(baseAvatarId); + if (avatar == null) return (Retcode.RetAvatarNotExist, null); + + var extraLineup = Player.LineupManager!.GetCurLineup()?.IsExtraLineup() == true; + + if (useConfig.PreviewHPRecoveryPercent != 0) + { + avatar.SetCurHp(Math.Min(Math.Max(avatar.CurrentHp + (int)(useConfig.PreviewHPRecoveryPercent * 10000), 0), 10000), extraLineup); + + await Player.SendPacket(new PacketSyncLineupNotify(Player.LineupManager.GetCurLineup()!)); + } + + if (useConfig.PreviewHPRecoveryValue != 0) + { + avatar.SetCurHp(Math.Min(Math.Max(avatar.CurrentHp + (int)useConfig.PreviewHPRecoveryValue, 0), 10000), extraLineup); + + await Player.SendPacket(new PacketSyncLineupNotify(Player.LineupManager.GetCurLineup()!)); + } + + if (useConfig.PreviewPowerPercent != 0) + { + avatar.SetCurSp(Math.Min(Math.Max(avatar.CurrentHp + (int)(useConfig.PreviewPowerPercent * 10000), 0), 10000), extraLineup); + + await Player.SendPacket(new PacketSyncLineupNotify(Player.LineupManager.GetCurLineup()!)); + } + + } + else + { + // team use + if (useConfig.PreviewHPRecoveryPercent != 0) + { + Player.LineupManager!.GetCurLineup()!.Heal((int)(useConfig.PreviewHPRecoveryPercent * 10000), true); + + await Player.SendPacket(new PacketSyncLineupNotify(Player.LineupManager.GetCurLineup()!)); + } + + if (useConfig.PreviewHPRecoveryValue != 0) + { + Player.LineupManager!.GetCurLineup()!.Heal((int)useConfig.PreviewHPRecoveryValue, true); + + await Player.SendPacket(new PacketSyncLineupNotify(Player.LineupManager.GetCurLineup()!)); + } + + if (useConfig.PreviewPowerPercent != 0) + { + Player.LineupManager!.GetCurLineup()!.AddPercentSp((int)(useConfig.PreviewPowerPercent * 10000)); + + await Player.SendPacket(new PacketSyncLineupNotify(Player.LineupManager.GetCurLineup()!)); + } + } + } + + //maze buff + if (useConfig.MazeBuffID > 0) + { + foreach (var info in Player.SceneInstance?.AvatarInfo.Values.ToList() ?? []) + { + if (baseAvatarId == 0 || info.AvatarInfo.GetBaseAvatarId() == baseAvatarId) + await info.AddBuff(new SceneBuff(useConfig.MazeBuffID, 1, info.AvatarInfo.AvatarId)); + } + } + + if (useConfig.MazeBuffID2 > 0) + { + foreach (var info in Player.SceneInstance?.AvatarInfo.Values.ToList() ?? []) + { + if (baseAvatarId == 0 || info.AvatarInfo.GetBaseAvatarId() == baseAvatarId) + await info.AddBuff(new SceneBuff(useConfig.MazeBuffID2, 1, info.AvatarInfo.AvatarId)); + } + } + + return (Retcode.RetSucc, null); + } + #region Equip public async ValueTask EquipAvatar(int avatarId, int equipmentUniqueId) diff --git a/GameServer/Game/Lineup/LineupManager.cs b/GameServer/Game/Lineup/LineupManager.cs index b373369f..2e374af9 100644 --- a/GameServer/Game/Lineup/LineupManager.cs +++ b/GameServer/Game/Lineup/LineupManager.cs @@ -5,6 +5,7 @@ using EggLink.DanhengServer.Database.Lineup; using EggLink.DanhengServer.GameServer.Game.Player; using EggLink.DanhengServer.GameServer.Game.Scene; using EggLink.DanhengServer.GameServer.Server.Packet.Send.Lineup; +using EggLink.DanhengServer.GameServer.Server.Packet.Send.Scene; using EggLink.DanhengServer.Proto; using EggLink.DanhengServer.Util; using LineupInfo = EggLink.DanhengServer.Database.Lineup.LineupInfo; @@ -355,12 +356,11 @@ public class LineupManager : BasePlayerManager curLineup.Mp = Math.Min(Math.Max(0, curLineup.Mp), 5); DatabaseHelper.Instance?.UpdateInstance(LineupData); - await Player.SendPacket(new PacketSceneCastSkillMpUpdateScNotify(castEntityId, curLineup.Mp)); + //await Player.SendPacket(new PacketSceneCastSkillMpUpdateScNotify(castEntityId, curLineup.Mp)); } public async ValueTask GainMp(int count, bool sendPacket = true) { - count = Math.Min(Math.Max(0, count), 2); var curLineup = GetCurLineup()!; curLineup.Mp += count; curLineup.Mp = Math.Min(Math.Max(0, curLineup.Mp), 5); diff --git a/GameServer/Game/Message/MessageManager.cs b/GameServer/Game/Message/MessageManager.cs index cbab46ff..57ef28a3 100644 --- a/GameServer/Game/Message/MessageManager.cs +++ b/GameServer/Game/Message/MessageManager.cs @@ -3,7 +3,7 @@ using EggLink.DanhengServer.Database; using EggLink.DanhengServer.Database.Message; using EggLink.DanhengServer.Enums.Mission; using EggLink.DanhengServer.GameServer.Game.Player; -using EggLink.DanhengServer.GameServer.Server.Packet.Send.Player; +using EggLink.DanhengServer.GameServer.Server.Packet.Send.PlayerSync; using EggLink.DanhengServer.Proto; using EggLink.DanhengServer.Util; diff --git a/GameServer/Game/Mission/FinishType/Handler/MissionHandlerBattleChallenge.cs b/GameServer/Game/Mission/FinishType/Handler/MissionHandlerBattleChallenge.cs index 32fdca1c..a696eb24 100644 --- a/GameServer/Game/Mission/FinishType/Handler/MissionHandlerBattleChallenge.cs +++ b/GameServer/Game/Mission/FinishType/Handler/MissionHandlerBattleChallenge.cs @@ -1,9 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using EggLink.DanhengServer.Data.Config; +using EggLink.DanhengServer.Data.Config; using EggLink.DanhengServer.Data.Excel; using EggLink.DanhengServer.Enums.Mission; using EggLink.DanhengServer.GameServer.Game.Battle; @@ -20,22 +15,17 @@ public class MissionHandlerBattleChallenge : MissionFinishTypeHandler await ValueTask.CompletedTask; } - public override async ValueTask HandleQuestFinishType(PlayerInstance player, QuestDataExcel quest, FinishWayExcel excel, object? arg) + public override async ValueTask HandleQuestFinishType(PlayerInstance player, QuestDataExcel quest, + FinishWayExcel excel, object? arg) { if (arg is BattleInstance instance) { var progress = 0; if (instance.BattleResult == null) return; foreach (var battleTargetList in instance.BattleResult.Stt.BattleTargetInfo.Values) - { - foreach (var battleTarget in battleTargetList.BattleTargetList_) - { - if (excel.ParamIntList.Contains((int)battleTarget.Id)) - { - progress += (int)battleTarget.Progress; - } - } - } + foreach (var battleTarget in battleTargetList.BattleTargetList_) + if (excel.ParamIntList.Contains((int)battleTarget.Id)) + progress += (int)battleTarget.Progress; await player.QuestManager!.UpdateQuestProgress(quest.QuestID, progress); } diff --git a/GameServer/Game/Mission/FinishType/Handler/MissionHandlerBattleWinWithCustomValue.cs b/GameServer/Game/Mission/FinishType/Handler/MissionHandlerBattleWinWithCustomValue.cs index bfa62fe6..074440a7 100644 --- a/GameServer/Game/Mission/FinishType/Handler/MissionHandlerBattleWinWithCustomValue.cs +++ b/GameServer/Game/Mission/FinishType/Handler/MissionHandlerBattleWinWithCustomValue.cs @@ -13,14 +13,16 @@ public class MissionHandlerBattleWinWithCustomValue : MissionFinishTypeHandler public override async ValueTask HandleMissionFinishType(PlayerInstance player, SubMissionInfo info, object? arg) { if (arg is not BattleInstance instance) return; - if (!instance.StageId.ToString().StartsWith(info.ParamInt2.ToString())) return; // check stage id - if (instance.BattleEndStatus != BattleEndStatus.BattleEndWin) return; // check battle status - if (instance.BattleResult == null) return; // check battle result - if (!instance.BattleResult.Stt.CustomValues.TryGetValue(info.ParamStr1, out var dValue)) return; // check custom value is exist + if (!instance.StageId.ToString().StartsWith(info.ParamInt2.ToString())) return; // check stage id + if (instance.BattleEndStatus != BattleEndStatus.BattleEndWin) return; // check battle status + if (instance.BattleResult == null) return; // check battle result + if (!instance.BattleResult.Stt.CustomValues.TryGetValue(info.ParamStr1, out var dValue)) + return; // check custom value is exist if ((int)dValue == info.ParamInt1) await player.MissionManager!.FinishSubMission(info.ID); } - public override async ValueTask HandleQuestFinishType(PlayerInstance player, QuestDataExcel quest, FinishWayExcel excel, object? arg) + public override async ValueTask HandleQuestFinishType(PlayerInstance player, QuestDataExcel quest, + FinishWayExcel excel, object? arg) { // this type wont be used in quest await ValueTask.CompletedTask; diff --git a/GameServer/Game/Mission/MissionManager.cs b/GameServer/Game/Mission/MissionManager.cs index 6d12cb91..a4f44e4d 100644 --- a/GameServer/Game/Mission/MissionManager.cs +++ b/GameServer/Game/Mission/MissionManager.cs @@ -12,7 +12,7 @@ using EggLink.DanhengServer.GameServer.Game.Player; using EggLink.DanhengServer.GameServer.Plugin.Event; using EggLink.DanhengServer.GameServer.Server.Packet.Send.HeartDial; using EggLink.DanhengServer.GameServer.Server.Packet.Send.Mission; -using EggLink.DanhengServer.GameServer.Server.Packet.Send.Player; +using EggLink.DanhengServer.GameServer.Server.Packet.Send.PlayerSync; using EggLink.DanhengServer.Proto; using EggLink.DanhengServer.Util; using MissionData = EggLink.DanhengServer.Database.Quests.MissionData; @@ -360,7 +360,7 @@ public class MissionManager : BasePlayerManager { GameData.ItemConfigData.TryGetValue(item.Item1, out var itemExcel); var res = await Player.InventoryManager!.AddItem(item.Item1, item.Item2, - itemExcel?.ItemMainType == ItemMainTypeEnum.AvatarCard); // notify if avatar card + itemExcel?.ItemMainType == ItemMainTypeEnum.AvatarCard); // notify if avatar card if (res != null) itemList.Add(res); } @@ -370,13 +370,13 @@ public class MissionManager : BasePlayerManager foreach (var i in mainMission.SubRewardList) { GameData.RewardDataData.TryGetValue(i, out var rewardDataExcel); - var hCoin2 = await Player.InventoryManager!.AddItem(1, rewardDataExcel?.Hcoin ?? 0, false); // hcoin + var hCoin2 = await Player.InventoryManager!.AddItem(1, rewardDataExcel?.Hcoin ?? 0, false); // hcoin if (hCoin2 != null) itemList.Add(hCoin2); - foreach (var item in rewardDataExcel?.GetItems() ?? []) // items + foreach (var item in rewardDataExcel?.GetItems() ?? []) // items { GameData.ItemConfigData.TryGetValue(item.Item1, out var itemExcel); var res = await Player.InventoryManager!.AddItem(item.Item1, item.Item2, - itemExcel?.ItemMainType == ItemMainTypeEnum.AvatarCard); // notify if avatar card + itemExcel?.ItemMainType == ItemMainTypeEnum.AvatarCard); // notify if avatar card if (res != null) itemList.Add(res); } } @@ -397,7 +397,7 @@ public class MissionManager : BasePlayerManager { GameData.ItemConfigData.TryGetValue(item.Item1, out var itemExcel); var res = await Player.InventoryManager!.AddItem(item.Item1, item.Item2, - itemExcel?.ItemMainType == ItemMainTypeEnum.AvatarCard); // notify if avatar card + itemExcel?.ItemMainType == ItemMainTypeEnum.AvatarCard); // notify if avatar card if (res != null) itemList.Add(res); } @@ -422,6 +422,7 @@ public class MissionManager : BasePlayerManager if (handler != null) await handler.HandleQuestFinishType(Player, excel, finishWay, arg); } + if (pushQuest) await Player.QuestManager!.SyncQuest(); } diff --git a/GameServer/Game/Mission/StoryLineEntityLoader.cs b/GameServer/Game/Mission/StoryLineEntityLoader.cs index 5bc24110..1b041b3f 100644 --- a/GameServer/Game/Mission/StoryLineEntityLoader.cs +++ b/GameServer/Game/Mission/StoryLineEntityLoader.cs @@ -21,8 +21,8 @@ public class StoryLineEntityLoader(SceneInstance scene) : SceneEntityLoader(scen GameData.StoryLineFloorDataData.TryGetValue(storyId, out var floorData); if (floorData == null) return; - floorData.TryGetValue(Scene.FloorInfo?.FloorID ?? 0, out var floorInfo); - floorInfo ??= new StoryLineFloorDataExcel { DimensionID = 0 }; // Default + floorData.TryGetValue(Scene.FloorInfo?.FloorID ?? 0, out var floorInfo); + floorInfo ??= new StoryLineFloorDataExcel { DimensionID = 0 }; // Default var dim = Scene.FloorInfo?.DimensionList.Find(d => d.ID == floorInfo.DimensionID); if (dim == null) return; diff --git a/GameServer/Game/Mission/StoryLineManager.cs b/GameServer/Game/Mission/StoryLineManager.cs index 7ed11f38..67cafc3b 100644 --- a/GameServer/Game/Mission/StoryLineManager.cs +++ b/GameServer/Game/Mission/StoryLineManager.cs @@ -4,7 +4,7 @@ using EggLink.DanhengServer.Database.Quests; using EggLink.DanhengServer.Enums.Mission; using EggLink.DanhengServer.GameServer.Game.Player; using EggLink.DanhengServer.GameServer.Server.Packet.Send.Lineup; -using EggLink.DanhengServer.GameServer.Server.Packet.Send.Mission; +using EggLink.DanhengServer.GameServer.Server.Packet.Send.StoryLine; using EggLink.DanhengServer.Proto; using EggLink.DanhengServer.Util; diff --git a/GameServer/Game/Player/PlayerInstance.cs b/GameServer/Game/Player/PlayerInstance.cs index 8f633515..95e7ccca 100644 --- a/GameServer/Game/Player/PlayerInstance.cs +++ b/GameServer/Game/Player/PlayerInstance.cs @@ -28,9 +28,9 @@ using EggLink.DanhengServer.GameServer.Game.Scene.Entity; using EggLink.DanhengServer.GameServer.Game.Shop; using EggLink.DanhengServer.GameServer.Game.Task; using EggLink.DanhengServer.GameServer.Server; -using EggLink.DanhengServer.GameServer.Server.Packet.Send.Avatar; using EggLink.DanhengServer.GameServer.Server.Packet.Send.Lineup; using EggLink.DanhengServer.GameServer.Server.Packet.Send.Player; +using EggLink.DanhengServer.GameServer.Server.Packet.Send.PlayerSync; using EggLink.DanhengServer.GameServer.Server.Packet.Send.Scene; using EggLink.DanhengServer.Kcp; using EggLink.DanhengServer.Proto; @@ -198,22 +198,17 @@ public class PlayerInstance(PlayerData data) } foreach (var avatar in AvatarManager?.AvatarData.Avatars ?? []) + foreach (var skill in avatar.GetSkillTree()) { - foreach (var skill in avatar.GetSkillTree()) - { - GameData.AvatarSkillTreeConfigData.TryGetValue(skill.Key * 10 + 1, out var config); - if (config == null) continue; - avatar.GetSkillTree()[skill.Key] = Math.Min(skill.Value, config.MaxLevel); // limit skill level - } + GameData.AvatarSkillTreeConfigData.TryGetValue(skill.Key * 10 + 1, out var config); + if (config == null) continue; + avatar.GetSkillTree()[skill.Key] = Math.Min(skill.Value, config.MaxLevel); // limit skill level } await LoadScene(Data.PlaneId, Data.FloorId, Data.EntryId, Data.Pos!, Data.Rot!, false); if (SceneInstance == null) await EnterScene(2000101, 0, false); - if (ConfigManager.Config.ServerOption.EnableMission) - { - await MissionManager!.AcceptMainMissionByCondition(); - } + if (ConfigManager.Config.ServerOption.EnableMission) await MissionManager!.AcceptMainMissionByCondition(); await QuestManager!.AcceptQuestByCondition(); } @@ -483,8 +478,10 @@ public class PlayerInstance(PlayerData data) if (prop.Group.GroupName.Contains("JigsawPuzzle") && prop.Group.GroupName.Contains("MainLine")) { var splits = prop.Group.GroupName.Split('_'); - key = $"JG_ML_{splits[3]}_Puzzle{(config.TargetState == PropStateEnum.Open ? "Started" : "Complete")}"; + key = + $"JG_ML_{splits[3]}_Puzzle{(config.TargetState == PropStateEnum.Open ? "Started" : "Complete")}"; } + if (SceneInstance?.FloorInfo?.SavedValues.Find(x => x.Name == key) != null) { // should save diff --git a/GameServer/Game/Quest/QuestManager.cs b/GameServer/Game/Quest/QuestManager.cs index c5c744bb..396d2dde 100644 --- a/GameServer/Game/Quest/QuestManager.cs +++ b/GameServer/Game/Quest/QuestManager.cs @@ -1,5 +1,4 @@ using EggLink.DanhengServer.Data; -using EggLink.DanhengServer.Data.Excel; using EggLink.DanhengServer.Database; using EggLink.DanhengServer.Database.Inventory; using EggLink.DanhengServer.Database.Quests; @@ -7,7 +6,7 @@ using EggLink.DanhengServer.Enums.Mission; using EggLink.DanhengServer.Enums.Quest; using EggLink.DanhengServer.GameServer.Game.Battle; using EggLink.DanhengServer.GameServer.Game.Player; -using EggLink.DanhengServer.GameServer.Server.Packet.Send.Player; +using EggLink.DanhengServer.GameServer.Server.Packet.Send.PlayerSync; using EggLink.DanhengServer.Proto; using EggLink.DanhengServer.Util; @@ -19,6 +18,24 @@ public class QuestManager(PlayerInstance player) : BasePlayerManager(player) public QuestData QuestData { get; } = DatabaseHelper.Instance!.GetInstanceOrCreateNew(player.Uid); public List WaitToSync { get; } = []; + #region Handler + + public void OnBattleStart(BattleInstance instance) + { + foreach (var questInfo in GetRunningQuest()) + { + var questExcel = GameData.QuestDataData.GetValueOrDefault(questInfo.QuestId); + if (questExcel == null) continue; + var finishWayExcel = GameData.FinishWayData.GetValueOrDefault(questExcel.FinishWayID); + if (finishWayExcel == null) continue; + if (finishWayExcel.FinishType == MissionFinishTypeEnum.BattleChallenge) + foreach (var target in finishWayExcel.ParamIntList) + instance.AddBattleTarget(2, target, GetQuestProgress(questExcel.QuestID), finishWayExcel.Progress); + } + } + + #endregion + #region Actions public async ValueTask AcceptQuestByCondition() @@ -43,10 +60,7 @@ public class QuestManager(PlayerInstance player) : BasePlayerManager(player) break; } - if (accept) - { - acceptQuest = await AcceptQuest(quest.QuestID, false); - } + if (accept) acceptQuest = await AcceptQuest(quest.QuestID, false); break; case QuestUnlockTypeEnum.FinishQuest: var accept2 = true; @@ -226,26 +240,4 @@ public class QuestManager(PlayerInstance player) : BasePlayerManager(player) } #endregion - - #region Handler - - public void OnBattleStart(BattleInstance instance) - { - foreach (var questInfo in GetRunningQuest()) - { - var questExcel = GameData.QuestDataData.GetValueOrDefault(questInfo.QuestId); - if (questExcel == null) continue; - var finishWayExcel = GameData.FinishWayData.GetValueOrDefault(questExcel.FinishWayID); - if (finishWayExcel == null) continue; - if (finishWayExcel.FinishType == MissionFinishTypeEnum.BattleChallenge) - { - foreach (var target in finishWayExcel.ParamIntList) - { - instance.AddBattleTarget(2, target, GetQuestProgress(questExcel.QuestID), finishWayExcel.Progress); - } - } - } - } - - #endregion } \ No newline at end of file diff --git a/GameServer/Game/Rogue/BaseRogueInstance.cs b/GameServer/Game/Rogue/BaseRogueInstance.cs index 544102f8..d32ab47e 100644 --- a/GameServer/Game/Rogue/BaseRogueInstance.cs +++ b/GameServer/Game/Rogue/BaseRogueInstance.cs @@ -8,7 +8,7 @@ using EggLink.DanhengServer.GameServer.Game.Rogue.Event; using EggLink.DanhengServer.GameServer.Game.Rogue.Miracle; using EggLink.DanhengServer.GameServer.Game.Rogue.Scene.Entity; using EggLink.DanhengServer.GameServer.Game.Scene.Entity; -using EggLink.DanhengServer.GameServer.Server.Packet.Send.Rogue; +using EggLink.DanhengServer.GameServer.Server.Packet.Send.RogueCommon; using EggLink.DanhengServer.GameServer.Server.Packet.Send.Scene; using EggLink.DanhengServer.Proto; using EggLink.DanhengServer.Util; diff --git a/GameServer/Game/Rogue/Event/RogueEventManager.cs b/GameServer/Game/Rogue/Event/RogueEventManager.cs index 88979b5a..24d677eb 100644 --- a/GameServer/Game/Rogue/Event/RogueEventManager.cs +++ b/GameServer/Game/Rogue/Event/RogueEventManager.cs @@ -2,7 +2,7 @@ using EggLink.DanhengServer.Data; using EggLink.DanhengServer.Enums.Rogue; using EggLink.DanhengServer.GameServer.Game.Player; -using EggLink.DanhengServer.GameServer.Server.Packet.Send.Rogue; +using EggLink.DanhengServer.GameServer.Server.Packet.Send.RogueCommon; namespace EggLink.DanhengServer.GameServer.Game.Rogue.Event; diff --git a/GameServer/Game/Rogue/Miracle/RogueMiracleInstance.cs b/GameServer/Game/Rogue/Miracle/RogueMiracleInstance.cs index 2750f9d8..17511d32 100644 --- a/GameServer/Game/Rogue/Miracle/RogueMiracleInstance.cs +++ b/GameServer/Game/Rogue/Miracle/RogueMiracleInstance.cs @@ -2,7 +2,7 @@ using EggLink.DanhengServer.Data.Custom; using EggLink.DanhengServer.Enums.Rogue; using EggLink.DanhengServer.GameServer.Game.Battle; -using EggLink.DanhengServer.GameServer.Server.Packet.Send.Rogue; +using EggLink.DanhengServer.GameServer.Server.Packet.Send.RogueCommon; using EggLink.DanhengServer.Proto; namespace EggLink.DanhengServer.GameServer.Game.Rogue.Miracle; diff --git a/GameServer/Game/Scene/SceneInstance.cs b/GameServer/Game/Scene/SceneInstance.cs index 32dd35a7..df8ff2cb 100644 --- a/GameServer/Game/Scene/SceneInstance.cs +++ b/GameServer/Game/Scene/SceneInstance.cs @@ -56,7 +56,7 @@ public class SceneInstance EntryId = (uint)EntryId, SceneMissionInfo = new MissionStatusBySceneInfo(), DimensionId = (uint)(EntityLoader is StoryLineEntityLoader loader ? loader.DimensionId : 0), - GameStoryLineId = (uint)(Player.StoryLineManager?.StoryLineData.CurStoryLineId ?? 0), + GameStoryLineId = (uint)(Player.StoryLineManager?.StoryLineData.CurStoryLineId ?? 0) }; var playerGroupInfo = new SceneEntityGroupInfo(); // avatar group diff --git a/GameServer/GameServer.csproj b/GameServer/GameServer.csproj index 7fc79100..d6ba3194 100644 --- a/GameServer/GameServer.csproj +++ b/GameServer/GameServer.csproj @@ -23,7 +23,18 @@ - + + + + + + + + + + + + diff --git a/GameServer/Server/Connection.cs b/GameServer/Server/Connection.cs index 4202e686..a214bb9e 100644 --- a/GameServer/Server/Connection.cs +++ b/GameServer/Server/Connection.cs @@ -1,6 +1,5 @@ using System.Buffers; using System.Net; -using EggLink.DanhengServer.Enums; using EggLink.DanhengServer.GameServer.Game.Player; using EggLink.DanhengServer.GameServer.Server.Packet; using EggLink.DanhengServer.Kcp; diff --git a/GameServer/Server/Listener.cs b/GameServer/Server/Listener.cs index 794443d4..7af7f9b8 100644 --- a/GameServer/Server/Listener.cs +++ b/GameServer/Server/Listener.cs @@ -1,5 +1,4 @@ -using EggLink.DanhengServer.Enums; -using EggLink.DanhengServer.Kcp; +using EggLink.DanhengServer.Kcp; namespace EggLink.DanhengServer.GameServer.Server; diff --git a/GameServer/Server/Packet/Recv/Activity/HandlerTakeTrialActivityRewardCsReq.cs b/GameServer/Server/Packet/Recv/Activity/HandlerTakeTrialActivityRewardCsReq.cs index cc0f7401..e6db7199 100644 --- a/GameServer/Server/Packet/Recv/Activity/HandlerTakeTrialActivityRewardCsReq.cs +++ b/GameServer/Server/Packet/Recv/Activity/HandlerTakeTrialActivityRewardCsReq.cs @@ -2,7 +2,7 @@ using EggLink.DanhengServer.Database.Activity; using EggLink.DanhengServer.Database.Inventory; using EggLink.DanhengServer.GameServer.Server.Packet.Send.Activity; -using EggLink.DanhengServer.GameServer.Server.Packet.Send.Player; +using EggLink.DanhengServer.GameServer.Server.Packet.Send.PlayerSync; using EggLink.DanhengServer.GameServer.Server.Packet.Send.Scene; using EggLink.DanhengServer.Kcp; using EggLink.DanhengServer.Proto; diff --git a/GameServer/Server/Packet/Recv/Player/HandlerGetArchiveDataCsReq.cs b/GameServer/Server/Packet/Recv/Archive/HandlerGetArchiveDataCsReq.cs similarity index 69% rename from GameServer/Server/Packet/Recv/Player/HandlerGetArchiveDataCsReq.cs rename to GameServer/Server/Packet/Recv/Archive/HandlerGetArchiveDataCsReq.cs index f330c587..7fdc3591 100644 --- a/GameServer/Server/Packet/Recv/Player/HandlerGetArchiveDataCsReq.cs +++ b/GameServer/Server/Packet/Recv/Archive/HandlerGetArchiveDataCsReq.cs @@ -1,7 +1,7 @@ -using EggLink.DanhengServer.GameServer.Server.Packet.Send.Player; +using EggLink.DanhengServer.GameServer.Server.Packet.Send.Archive; using EggLink.DanhengServer.Kcp; -namespace EggLink.DanhengServer.GameServer.Server.Packet.Recv.Player; +namespace EggLink.DanhengServer.GameServer.Server.Packet.Recv.Archive; [Opcode(CmdIds.GetArchiveDataCsReq)] public class HandlerGetArchiveDataCsReq : Handler diff --git a/GameServer/Server/Packet/Recv/Avatar/HandlerTakePromotionRewardCsReq.cs b/GameServer/Server/Packet/Recv/Avatar/HandlerTakePromotionRewardCsReq.cs index f0bd68d4..b61260b2 100644 --- a/GameServer/Server/Packet/Recv/Avatar/HandlerTakePromotionRewardCsReq.cs +++ b/GameServer/Server/Packet/Recv/Avatar/HandlerTakePromotionRewardCsReq.cs @@ -1,5 +1,5 @@ using EggLink.DanhengServer.GameServer.Server.Packet.Send.Avatar; -using EggLink.DanhengServer.GameServer.Server.Packet.Send.Player; +using EggLink.DanhengServer.GameServer.Server.Packet.Send.PlayerSync; using EggLink.DanhengServer.Kcp; using EggLink.DanhengServer.Proto; diff --git a/GameServer/Server/Packet/Recv/Avatar/HandlerUnlockSkilltreeCsReq.cs b/GameServer/Server/Packet/Recv/Avatar/HandlerUnlockSkilltreeCsReq.cs index b108edf1..b5311df7 100644 --- a/GameServer/Server/Packet/Recv/Avatar/HandlerUnlockSkilltreeCsReq.cs +++ b/GameServer/Server/Packet/Recv/Avatar/HandlerUnlockSkilltreeCsReq.cs @@ -1,7 +1,7 @@ using EggLink.DanhengServer.Data; using EggLink.DanhengServer.Enums.Mission; using EggLink.DanhengServer.GameServer.Server.Packet.Send.Avatar; -using EggLink.DanhengServer.GameServer.Server.Packet.Send.Player; +using EggLink.DanhengServer.GameServer.Server.Packet.Send.PlayerSync; using EggLink.DanhengServer.Kcp; using EggLink.DanhengServer.Proto; diff --git a/GameServer/Server/Packet/Recv/Friend/HandlerGetChatFriendHistoryCsReq.cs b/GameServer/Server/Packet/Recv/Chat/HandlerGetChatFriendHistoryCsReq.cs similarity index 81% rename from GameServer/Server/Packet/Recv/Friend/HandlerGetChatFriendHistoryCsReq.cs rename to GameServer/Server/Packet/Recv/Chat/HandlerGetChatFriendHistoryCsReq.cs index c5741818..ba9e4cc3 100644 --- a/GameServer/Server/Packet/Recv/Friend/HandlerGetChatFriendHistoryCsReq.cs +++ b/GameServer/Server/Packet/Recv/Chat/HandlerGetChatFriendHistoryCsReq.cs @@ -1,6 +1,6 @@ using EggLink.DanhengServer.Kcp; -namespace EggLink.DanhengServer.GameServer.Server.Packet.Recv.Friend; +namespace EggLink.DanhengServer.GameServer.Server.Packet.Recv.Chat; [Opcode(CmdIds.GetChatFriendHistoryCsReq)] public class HandlerGetChatFriendHistoryCsReq : Handler diff --git a/GameServer/Server/Packet/Recv/Friend/HandlerGetPrivateChatHistoryCsReq.cs b/GameServer/Server/Packet/Recv/Chat/HandlerGetPrivateChatHistoryCsReq.cs similarity index 76% rename from GameServer/Server/Packet/Recv/Friend/HandlerGetPrivateChatHistoryCsReq.cs rename to GameServer/Server/Packet/Recv/Chat/HandlerGetPrivateChatHistoryCsReq.cs index 504ba61f..2811584f 100644 --- a/GameServer/Server/Packet/Recv/Friend/HandlerGetPrivateChatHistoryCsReq.cs +++ b/GameServer/Server/Packet/Recv/Chat/HandlerGetPrivateChatHistoryCsReq.cs @@ -1,8 +1,8 @@ -using EggLink.DanhengServer.GameServer.Server.Packet.Send.Friend; +using EggLink.DanhengServer.GameServer.Server.Packet.Send.Chat; using EggLink.DanhengServer.Kcp; using EggLink.DanhengServer.Proto; -namespace EggLink.DanhengServer.GameServer.Server.Packet.Recv.Friend; +namespace EggLink.DanhengServer.GameServer.Server.Packet.Recv.Chat; [Opcode(CmdIds.GetPrivateChatHistoryCsReq)] public class HandlerGetPrivateChatHistoryCsReq : Handler diff --git a/GameServer/Server/Packet/Recv/Friend/HandlerSendMsgCsReq.cs b/GameServer/Server/Packet/Recv/Chat/HandlerSendMsgCsReq.cs similarity index 91% rename from GameServer/Server/Packet/Recv/Friend/HandlerSendMsgCsReq.cs rename to GameServer/Server/Packet/Recv/Chat/HandlerSendMsgCsReq.cs index c1ad14ab..2b412e1d 100644 --- a/GameServer/Server/Packet/Recv/Friend/HandlerSendMsgCsReq.cs +++ b/GameServer/Server/Packet/Recv/Chat/HandlerSendMsgCsReq.cs @@ -1,7 +1,7 @@ using EggLink.DanhengServer.Kcp; using EggLink.DanhengServer.Proto; -namespace EggLink.DanhengServer.GameServer.Server.Packet.Recv.Friend; +namespace EggLink.DanhengServer.GameServer.Server.Packet.Recv.Chat; [Opcode(CmdIds.SendMsgCsReq)] public class HandlerSendMsgCsReq : Handler diff --git a/GameServer/Server/Packet/Recv/Rogue/HandlerChessRogueCheatRollCsReq.cs b/GameServer/Server/Packet/Recv/ChessRogue/HandlerChessRogueCheatRollCsReq.cs similarity index 87% rename from GameServer/Server/Packet/Recv/Rogue/HandlerChessRogueCheatRollCsReq.cs rename to GameServer/Server/Packet/Recv/ChessRogue/HandlerChessRogueCheatRollCsReq.cs index 45af0aec..071cef50 100644 --- a/GameServer/Server/Packet/Recv/Rogue/HandlerChessRogueCheatRollCsReq.cs +++ b/GameServer/Server/Packet/Recv/ChessRogue/HandlerChessRogueCheatRollCsReq.cs @@ -1,7 +1,7 @@ using EggLink.DanhengServer.Kcp; using EggLink.DanhengServer.Proto; -namespace EggLink.DanhengServer.GameServer.Server.Packet.Recv.Rogue; +namespace EggLink.DanhengServer.GameServer.Server.Packet.Recv.ChessRogue; [Opcode(CmdIds.ChessRogueCheatRollCsReq)] public class HandlerChessRogueCheatRollCsReq : Handler diff --git a/GameServer/Server/Packet/Recv/Rogue/HandlerChessRogueReRollDiceCsReq.cs b/GameServer/Server/Packet/Recv/ChessRogue/HandlerChessRogueReRollDiceCsReq.cs similarity index 84% rename from GameServer/Server/Packet/Recv/Rogue/HandlerChessRogueReRollDiceCsReq.cs rename to GameServer/Server/Packet/Recv/ChessRogue/HandlerChessRogueReRollDiceCsReq.cs index e5adb198..8b159f85 100644 --- a/GameServer/Server/Packet/Recv/Rogue/HandlerChessRogueReRollDiceCsReq.cs +++ b/GameServer/Server/Packet/Recv/ChessRogue/HandlerChessRogueReRollDiceCsReq.cs @@ -1,6 +1,6 @@ using EggLink.DanhengServer.Kcp; -namespace EggLink.DanhengServer.GameServer.Server.Packet.Recv.Rogue; +namespace EggLink.DanhengServer.GameServer.Server.Packet.Recv.ChessRogue; [Opcode(CmdIds.ChessRogueReRollDiceCsReq)] public class HandlerChessRogueReRollDiceCsReq : Handler diff --git a/GameServer/Server/Packet/Recv/Rogue/HandlerChessRogueSelectCellCsReq.cs b/GameServer/Server/Packet/Recv/ChessRogue/HandlerChessRogueSelectCellCsReq.cs similarity index 87% rename from GameServer/Server/Packet/Recv/Rogue/HandlerChessRogueSelectCellCsReq.cs rename to GameServer/Server/Packet/Recv/ChessRogue/HandlerChessRogueSelectCellCsReq.cs index 1b96b207..745f91ad 100644 --- a/GameServer/Server/Packet/Recv/Rogue/HandlerChessRogueSelectCellCsReq.cs +++ b/GameServer/Server/Packet/Recv/ChessRogue/HandlerChessRogueSelectCellCsReq.cs @@ -1,7 +1,7 @@ using EggLink.DanhengServer.Kcp; using EggLink.DanhengServer.Proto; -namespace EggLink.DanhengServer.GameServer.Server.Packet.Recv.Rogue; +namespace EggLink.DanhengServer.GameServer.Server.Packet.Recv.ChessRogue; [Opcode(CmdIds.ChessRogueSelectCellCsReq)] public class HandlerChessRogueSelectCellCsReq : Handler diff --git a/GameServer/Server/Packet/Recv/Rogue/HandlerEnhanceChessRogueBuffCsReq.cs b/GameServer/Server/Packet/Recv/ChessRogue/HandlerEnhanceChessRogueBuffCsReq.cs similarity index 90% rename from GameServer/Server/Packet/Recv/Rogue/HandlerEnhanceChessRogueBuffCsReq.cs rename to GameServer/Server/Packet/Recv/ChessRogue/HandlerEnhanceChessRogueBuffCsReq.cs index b430d721..0c572942 100644 --- a/GameServer/Server/Packet/Recv/Rogue/HandlerEnhanceChessRogueBuffCsReq.cs +++ b/GameServer/Server/Packet/Recv/ChessRogue/HandlerEnhanceChessRogueBuffCsReq.cs @@ -2,7 +2,7 @@ using EggLink.DanhengServer.Kcp; using EggLink.DanhengServer.Proto; -namespace EggLink.DanhengServer.GameServer.Server.Packet.Recv.Rogue; +namespace EggLink.DanhengServer.GameServer.Server.Packet.Recv.ChessRogue; [Opcode(CmdIds.EnhanceChessRogueBuffCsReq)] public class HandlerEnhanceChessRogueBuffCsReq : Handler diff --git a/GameServer/Server/Packet/Recv/Scene/HandlerContentPackageGetDataCsReq.cs b/GameServer/Server/Packet/Recv/ContentPackage/HandlerContentPackageGetDataCsReq.cs similarity index 76% rename from GameServer/Server/Packet/Recv/Scene/HandlerContentPackageGetDataCsReq.cs rename to GameServer/Server/Packet/Recv/ContentPackage/HandlerContentPackageGetDataCsReq.cs index d6f9c058..734237e4 100644 --- a/GameServer/Server/Packet/Recv/Scene/HandlerContentPackageGetDataCsReq.cs +++ b/GameServer/Server/Packet/Recv/ContentPackage/HandlerContentPackageGetDataCsReq.cs @@ -1,8 +1,8 @@ -using EggLink.DanhengServer.GameServer.Server.Packet.Send.Scene; +using EggLink.DanhengServer.GameServer.Server.Packet.Send.ContentPackage; using EggLink.DanhengServer.Kcp; using EggLink.DanhengServer.Proto; -namespace EggLink.DanhengServer.GameServer.Server.Packet.Recv.Scene; +namespace EggLink.DanhengServer.GameServer.Server.Packet.Recv.ContentPackage; [Opcode(CmdIds.ContentPackageGetDataCsReq)] public class HandlerContentPackageGetDataCsReq : Handler diff --git a/GameServer/Server/Packet/Recv/Avatar/HandlerGetAssistHistoryCsReq.cs b/GameServer/Server/Packet/Recv/Friend/HandlerGetAssistHistoryCsReq.cs similarity index 69% rename from GameServer/Server/Packet/Recv/Avatar/HandlerGetAssistHistoryCsReq.cs rename to GameServer/Server/Packet/Recv/Friend/HandlerGetAssistHistoryCsReq.cs index 2fd1b0d0..65d81e43 100644 --- a/GameServer/Server/Packet/Recv/Avatar/HandlerGetAssistHistoryCsReq.cs +++ b/GameServer/Server/Packet/Recv/Friend/HandlerGetAssistHistoryCsReq.cs @@ -1,7 +1,7 @@ -using EggLink.DanhengServer.GameServer.Server.Packet.Send.Avatar; +using EggLink.DanhengServer.GameServer.Server.Packet.Send.Friend; using EggLink.DanhengServer.Kcp; -namespace EggLink.DanhengServer.GameServer.Server.Packet.Recv.Avatar; +namespace EggLink.DanhengServer.GameServer.Server.Packet.Recv.Friend; [Opcode(CmdIds.GetAssistHistoryCsReq)] public class HandlerGetAssistHistoryCsReq : Handler diff --git a/GameServer/Server/Packet/Recv/Avatar/HandlerGetAssistListCsReq.cs b/GameServer/Server/Packet/Recv/Friend/HandlerGetAssistListCsReq.cs similarity index 67% rename from GameServer/Server/Packet/Recv/Avatar/HandlerGetAssistListCsReq.cs rename to GameServer/Server/Packet/Recv/Friend/HandlerGetAssistListCsReq.cs index f7f3e3e4..09f1ef4e 100644 --- a/GameServer/Server/Packet/Recv/Avatar/HandlerGetAssistListCsReq.cs +++ b/GameServer/Server/Packet/Recv/Friend/HandlerGetAssistListCsReq.cs @@ -1,7 +1,7 @@ -using EggLink.DanhengServer.GameServer.Server.Packet.Send.Avatar; +using EggLink.DanhengServer.GameServer.Server.Packet.Send.Friend; using EggLink.DanhengServer.Kcp; -namespace EggLink.DanhengServer.GameServer.Server.Packet.Recv.Avatar; +namespace EggLink.DanhengServer.GameServer.Server.Packet.Recv.Friend; [Opcode(CmdIds.GetAssistListCsReq)] public class HandlerGetAssistListCsReq : Handler diff --git a/GameServer/Server/Packet/Recv/Avatar/HandlerGetCurAssistCsReq.cs b/GameServer/Server/Packet/Recv/Friend/HandlerGetCurAssistCsReq.cs similarity index 80% rename from GameServer/Server/Packet/Recv/Avatar/HandlerGetCurAssistCsReq.cs rename to GameServer/Server/Packet/Recv/Friend/HandlerGetCurAssistCsReq.cs index b4b4da40..0d02c550 100644 --- a/GameServer/Server/Packet/Recv/Avatar/HandlerGetCurAssistCsReq.cs +++ b/GameServer/Server/Packet/Recv/Friend/HandlerGetCurAssistCsReq.cs @@ -1,6 +1,6 @@ using EggLink.DanhengServer.Kcp; -namespace EggLink.DanhengServer.GameServer.Server.Packet.Recv.Avatar; +namespace EggLink.DanhengServer.GameServer.Server.Packet.Recv.Friend; [Opcode(CmdIds.GetCurAssistCsReq)] public class HandlerGetCurAssistCsReq : Handler diff --git a/GameServer/Server/Packet/Recv/Shop/HandlerComposeItemCsReq.cs b/GameServer/Server/Packet/Recv/Item/HandlerComposeItemCsReq.cs similarity index 83% rename from GameServer/Server/Packet/Recv/Shop/HandlerComposeItemCsReq.cs rename to GameServer/Server/Packet/Recv/Item/HandlerComposeItemCsReq.cs index c99b6384..70f7d630 100644 --- a/GameServer/Server/Packet/Recv/Shop/HandlerComposeItemCsReq.cs +++ b/GameServer/Server/Packet/Recv/Item/HandlerComposeItemCsReq.cs @@ -1,8 +1,8 @@ -using EggLink.DanhengServer.GameServer.Server.Packet.Send.Shop; +using EggLink.DanhengServer.GameServer.Server.Packet.Send.Item; using EggLink.DanhengServer.Kcp; using EggLink.DanhengServer.Proto; -namespace EggLink.DanhengServer.GameServer.Server.Packet.Recv.Shop; +namespace EggLink.DanhengServer.GameServer.Server.Packet.Recv.Item; [Opcode(CmdIds.ComposeItemCsReq)] public class HandlerComposeItemCsReq : Handler diff --git a/GameServer/Server/Packet/Recv/Player/HandlerDestroyItemCsReq.cs b/GameServer/Server/Packet/Recv/Item/HandlerDestroyItemCsReq.cs similarity index 87% rename from GameServer/Server/Packet/Recv/Player/HandlerDestroyItemCsReq.cs rename to GameServer/Server/Packet/Recv/Item/HandlerDestroyItemCsReq.cs index cfbcd2c4..d4bb0249 100644 --- a/GameServer/Server/Packet/Recv/Player/HandlerDestroyItemCsReq.cs +++ b/GameServer/Server/Packet/Recv/Item/HandlerDestroyItemCsReq.cs @@ -1,7 +1,7 @@ using EggLink.DanhengServer.Kcp; using EggLink.DanhengServer.Proto; -namespace EggLink.DanhengServer.GameServer.Server.Packet.Recv.Player; +namespace EggLink.DanhengServer.GameServer.Server.Packet.Recv.Item; [Opcode(CmdIds.DestroyItemCsReq)] public class HandlerDestroyItemCsReq : Handler diff --git a/GameServer/Server/Packet/Recv/Avatar/HandlerExpUpEquipmentCsReq.cs b/GameServer/Server/Packet/Recv/Item/HandlerExpUpEquipmentCsReq.cs similarity index 80% rename from GameServer/Server/Packet/Recv/Avatar/HandlerExpUpEquipmentCsReq.cs rename to GameServer/Server/Packet/Recv/Item/HandlerExpUpEquipmentCsReq.cs index 3926bc6b..43b19729 100644 --- a/GameServer/Server/Packet/Recv/Avatar/HandlerExpUpEquipmentCsReq.cs +++ b/GameServer/Server/Packet/Recv/Item/HandlerExpUpEquipmentCsReq.cs @@ -1,8 +1,8 @@ -using EggLink.DanhengServer.GameServer.Server.Packet.Send.Avatar; +using EggLink.DanhengServer.GameServer.Server.Packet.Send.Item; using EggLink.DanhengServer.Kcp; using EggLink.DanhengServer.Proto; -namespace EggLink.DanhengServer.GameServer.Server.Packet.Recv.Avatar; +namespace EggLink.DanhengServer.GameServer.Server.Packet.Recv.Item; [Opcode(CmdIds.ExpUpEquipmentCsReq)] public class HandlerExpUpEquipmentCsReq : Handler diff --git a/GameServer/Server/Packet/Recv/Avatar/HandlerExpUpRelicCsReq.cs b/GameServer/Server/Packet/Recv/Item/HandlerExpUpRelicCsReq.cs similarity index 78% rename from GameServer/Server/Packet/Recv/Avatar/HandlerExpUpRelicCsReq.cs rename to GameServer/Server/Packet/Recv/Item/HandlerExpUpRelicCsReq.cs index 69ac2e0e..ccdba67f 100644 --- a/GameServer/Server/Packet/Recv/Avatar/HandlerExpUpRelicCsReq.cs +++ b/GameServer/Server/Packet/Recv/Item/HandlerExpUpRelicCsReq.cs @@ -1,8 +1,8 @@ -using EggLink.DanhengServer.GameServer.Server.Packet.Send.Avatar; +using EggLink.DanhengServer.GameServer.Server.Packet.Send.Item; using EggLink.DanhengServer.Kcp; using EggLink.DanhengServer.Proto; -namespace EggLink.DanhengServer.GameServer.Server.Packet.Recv.Avatar; +namespace EggLink.DanhengServer.GameServer.Server.Packet.Recv.Item; [Opcode(CmdIds.ExpUpRelicCsReq)] public class HandlerExpUpRelicCsReq : Handler diff --git a/GameServer/Server/Packet/Recv/Player/HandlerGetBagCsReq.cs b/GameServer/Server/Packet/Recv/Item/HandlerGetBagCsReq.cs similarity index 67% rename from GameServer/Server/Packet/Recv/Player/HandlerGetBagCsReq.cs rename to GameServer/Server/Packet/Recv/Item/HandlerGetBagCsReq.cs index ddd0fd97..f5345242 100644 --- a/GameServer/Server/Packet/Recv/Player/HandlerGetBagCsReq.cs +++ b/GameServer/Server/Packet/Recv/Item/HandlerGetBagCsReq.cs @@ -1,7 +1,7 @@ -using EggLink.DanhengServer.GameServer.Server.Packet.Send.Player; +using EggLink.DanhengServer.GameServer.Server.Packet.Send.Item; using EggLink.DanhengServer.Kcp; -namespace EggLink.DanhengServer.GameServer.Server.Packet.Recv.Player; +namespace EggLink.DanhengServer.GameServer.Server.Packet.Recv.Item; [Opcode(CmdIds.GetBagCsReq)] public class HandlerGetBagCsReq : Handler diff --git a/GameServer/Server/Packet/Recv/Avatar/HandlerPromoteEquipmentCsReq.cs b/GameServer/Server/Packet/Recv/Item/HandlerPromoteEquipmentCsReq.cs similarity index 87% rename from GameServer/Server/Packet/Recv/Avatar/HandlerPromoteEquipmentCsReq.cs rename to GameServer/Server/Packet/Recv/Item/HandlerPromoteEquipmentCsReq.cs index 10ba937f..9b8582b9 100644 --- a/GameServer/Server/Packet/Recv/Avatar/HandlerPromoteEquipmentCsReq.cs +++ b/GameServer/Server/Packet/Recv/Item/HandlerPromoteEquipmentCsReq.cs @@ -1,7 +1,7 @@ using EggLink.DanhengServer.Kcp; using EggLink.DanhengServer.Proto; -namespace EggLink.DanhengServer.GameServer.Server.Packet.Recv.Avatar; +namespace EggLink.DanhengServer.GameServer.Server.Packet.Recv.Item; [Opcode(CmdIds.PromoteEquipmentCsReq)] public class HandlerPromoteEquipmentCsReq : Handler diff --git a/GameServer/Server/Packet/Recv/Avatar/HandlerRankUpEquipmentCsReq.cs b/GameServer/Server/Packet/Recv/Item/HandlerRankUpEquipmentCsReq.cs similarity index 87% rename from GameServer/Server/Packet/Recv/Avatar/HandlerRankUpEquipmentCsReq.cs rename to GameServer/Server/Packet/Recv/Item/HandlerRankUpEquipmentCsReq.cs index d7a5659a..7214ec71 100644 --- a/GameServer/Server/Packet/Recv/Avatar/HandlerRankUpEquipmentCsReq.cs +++ b/GameServer/Server/Packet/Recv/Item/HandlerRankUpEquipmentCsReq.cs @@ -1,7 +1,7 @@ using EggLink.DanhengServer.Kcp; using EggLink.DanhengServer.Proto; -namespace EggLink.DanhengServer.GameServer.Server.Packet.Recv.Avatar; +namespace EggLink.DanhengServer.GameServer.Server.Packet.Recv.Item; [Opcode(CmdIds.RankUpEquipmentCsReq)] public class HandlerRankUpEquipmentCsReq : Handler diff --git a/GameServer/Server/Packet/Recv/Player/HandlerRelicRecommendCsReq.cs b/GameServer/Server/Packet/Recv/Item/HandlerRelicRecommendCsReq.cs similarity index 80% rename from GameServer/Server/Packet/Recv/Player/HandlerRelicRecommendCsReq.cs rename to GameServer/Server/Packet/Recv/Item/HandlerRelicRecommendCsReq.cs index dacb5ac9..11194186 100644 --- a/GameServer/Server/Packet/Recv/Player/HandlerRelicRecommendCsReq.cs +++ b/GameServer/Server/Packet/Recv/Item/HandlerRelicRecommendCsReq.cs @@ -1,6 +1,6 @@ using EggLink.DanhengServer.Kcp; -namespace EggLink.DanhengServer.GameServer.Server.Packet.Recv.Player; +namespace EggLink.DanhengServer.GameServer.Server.Packet.Recv.Item; [Opcode(CmdIds.RelicRecommendCsReq)] public class HandlerRelicRecommendCsReq : Handler diff --git a/GameServer/Server/Packet/Recv/Shop/HandlerSellItemCsReq.cs b/GameServer/Server/Packet/Recv/Item/HandlerSellItemCsReq.cs similarity index 77% rename from GameServer/Server/Packet/Recv/Shop/HandlerSellItemCsReq.cs rename to GameServer/Server/Packet/Recv/Item/HandlerSellItemCsReq.cs index c860e6e0..3475f8f0 100644 --- a/GameServer/Server/Packet/Recv/Shop/HandlerSellItemCsReq.cs +++ b/GameServer/Server/Packet/Recv/Item/HandlerSellItemCsReq.cs @@ -1,8 +1,8 @@ -using EggLink.DanhengServer.GameServer.Server.Packet.Send.Shop; +using EggLink.DanhengServer.GameServer.Server.Packet.Send.Item; using EggLink.DanhengServer.Kcp; using EggLink.DanhengServer.Proto; -namespace EggLink.DanhengServer.GameServer.Server.Packet.Recv.Shop; +namespace EggLink.DanhengServer.GameServer.Server.Packet.Recv.Item; [Opcode(CmdIds.SellItemCsReq)] public class HandlerSellItemCsReq : Handler diff --git a/GameServer/Server/Packet/Recv/Item/HandlerUseItemCsReq.cs b/GameServer/Server/Packet/Recv/Item/HandlerUseItemCsReq.cs new file mode 100644 index 00000000..7bf151cf --- /dev/null +++ b/GameServer/Server/Packet/Recv/Item/HandlerUseItemCsReq.cs @@ -0,0 +1,17 @@ +using EggLink.DanhengServer.GameServer.Server.Packet.Send.Item; +using EggLink.DanhengServer.Kcp; +using EggLink.DanhengServer.Proto; + +namespace EggLink.DanhengServer.GameServer.Server.Packet.Recv.Item; + +[Opcode(CmdIds.UseItemCsReq)] +public class HandlerUseItemCsReq : Handler +{ + public override async Task OnHandle(Connection connection, byte[] header, byte[] data) + { + var req = UseItemCsReq.Parser.ParseFrom(data); + var result = await connection.Player!.InventoryManager!.UseItem((int)req.UseItemId, (int)req.UseItemCount, (int)req.BaseAvatarId); + + await connection.SendPacket(new PacketUseItemScRsp(result.Item1, req.UseItemId, req.UseItemCount, result.returnItems)); + } +} \ No newline at end of file diff --git a/GameServer/Server/Packet/Recv/Player/HandlerGetJukeboxDataCsReq.cs b/GameServer/Server/Packet/Recv/JukeBox/HandlerGetJukeboxDataCsReq.cs similarity index 69% rename from GameServer/Server/Packet/Recv/Player/HandlerGetJukeboxDataCsReq.cs rename to GameServer/Server/Packet/Recv/JukeBox/HandlerGetJukeboxDataCsReq.cs index b1aca1cc..cfbd3c8f 100644 --- a/GameServer/Server/Packet/Recv/Player/HandlerGetJukeboxDataCsReq.cs +++ b/GameServer/Server/Packet/Recv/JukeBox/HandlerGetJukeboxDataCsReq.cs @@ -1,7 +1,7 @@ -using EggLink.DanhengServer.GameServer.Server.Packet.Send.Player; +using EggLink.DanhengServer.GameServer.Server.Packet.Send.JukeBox; using EggLink.DanhengServer.Kcp; -namespace EggLink.DanhengServer.GameServer.Server.Packet.Recv.Player; +namespace EggLink.DanhengServer.GameServer.Server.Packet.Recv.JukeBox; [Opcode(CmdIds.GetJukeboxDataCsReq)] public class HandlerGetJukeboxDataCsReq : Handler diff --git a/GameServer/Server/Packet/Recv/Player/HandlerPlayBackGroundMusicCsReq.cs b/GameServer/Server/Packet/Recv/JukeBox/HandlerPlayBackGroundMusicCsReq.cs similarity index 77% rename from GameServer/Server/Packet/Recv/Player/HandlerPlayBackGroundMusicCsReq.cs rename to GameServer/Server/Packet/Recv/JukeBox/HandlerPlayBackGroundMusicCsReq.cs index 1a92e6b4..d103e643 100644 --- a/GameServer/Server/Packet/Recv/Player/HandlerPlayBackGroundMusicCsReq.cs +++ b/GameServer/Server/Packet/Recv/JukeBox/HandlerPlayBackGroundMusicCsReq.cs @@ -1,8 +1,8 @@ -using EggLink.DanhengServer.GameServer.Server.Packet.Send.Player; +using EggLink.DanhengServer.GameServer.Server.Packet.Send.JukeBox; using EggLink.DanhengServer.Kcp; using EggLink.DanhengServer.Proto; -namespace EggLink.DanhengServer.GameServer.Server.Packet.Recv.Player; +namespace EggLink.DanhengServer.GameServer.Server.Packet.Recv.JukeBox; [Opcode(CmdIds.PlayBackGroundMusicCsReq)] public class HandlerPlayBackGroundMusicCsReq : Handler diff --git a/GameServer/Server/Packet/Recv/Mail/HandlerDelMailCsReq.cs b/GameServer/Server/Packet/Recv/Mail/HandlerDelMailCsReq.cs index 4d118a04..54a5e531 100644 --- a/GameServer/Server/Packet/Recv/Mail/HandlerDelMailCsReq.cs +++ b/GameServer/Server/Packet/Recv/Mail/HandlerDelMailCsReq.cs @@ -1,9 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using EggLink.DanhengServer.GameServer.Server.Packet.Send.Mail; +using EggLink.DanhengServer.GameServer.Server.Packet.Send.Mail; using EggLink.DanhengServer.Kcp; using EggLink.DanhengServer.Proto; @@ -16,10 +11,7 @@ public class HandlerDelMailCsReq : Handler { var req = DelMailCsReq.Parser.ParseFrom(data); - foreach (var id in req.IdList) - { - connection.Player!.MailManager?.DeleteMail((int)id); - } + foreach (var id in req.IdList) connection.Player!.MailManager?.DeleteMail((int)id); await connection.SendPacket(new PacketDelMailScRsp([..req.IdList])); } diff --git a/GameServer/Server/Packet/Recv/Player/HandlerDeployRotaterCsReq.cs b/GameServer/Server/Packet/Recv/MapRotation/HandlerDeployRotaterCsReq.cs similarity index 76% rename from GameServer/Server/Packet/Recv/Player/HandlerDeployRotaterCsReq.cs rename to GameServer/Server/Packet/Recv/MapRotation/HandlerDeployRotaterCsReq.cs index 5ece4732..8af463e1 100644 --- a/GameServer/Server/Packet/Recv/Player/HandlerDeployRotaterCsReq.cs +++ b/GameServer/Server/Packet/Recv/MapRotation/HandlerDeployRotaterCsReq.cs @@ -1,8 +1,8 @@ -using EggLink.DanhengServer.GameServer.Server.Packet.Send.Player; +using EggLink.DanhengServer.GameServer.Server.Packet.Send.MapRotation; using EggLink.DanhengServer.Kcp; using EggLink.DanhengServer.Proto; -namespace EggLink.DanhengServer.GameServer.Server.Packet.Recv.Player; +namespace EggLink.DanhengServer.GameServer.Server.Packet.Recv.MapRotation; [Opcode(CmdIds.DeployRotaterCsReq)] public class HandlerDeployRotaterCsReq : Handler diff --git a/GameServer/Server/Packet/Recv/Scene/HandlerEnterMapRotationRegionCsReq.cs b/GameServer/Server/Packet/Recv/MapRotation/HandlerEnterMapRotationRegionCsReq.cs similarity index 74% rename from GameServer/Server/Packet/Recv/Scene/HandlerEnterMapRotationRegionCsReq.cs rename to GameServer/Server/Packet/Recv/MapRotation/HandlerEnterMapRotationRegionCsReq.cs index 6075dff3..f3f132a1 100644 --- a/GameServer/Server/Packet/Recv/Scene/HandlerEnterMapRotationRegionCsReq.cs +++ b/GameServer/Server/Packet/Recv/MapRotation/HandlerEnterMapRotationRegionCsReq.cs @@ -1,8 +1,8 @@ -using EggLink.DanhengServer.GameServer.Server.Packet.Send.Scene; +using EggLink.DanhengServer.GameServer.Server.Packet.Send.MapRotation; using EggLink.DanhengServer.Kcp; using EggLink.DanhengServer.Proto; -namespace EggLink.DanhengServer.GameServer.Server.Packet.Recv.Scene; +namespace EggLink.DanhengServer.GameServer.Server.Packet.Recv.MapRotation; [Opcode(CmdIds.EnterMapRotationRegionCsReq)] public class HandlerEnterMapRotationRegionCsReq : Handler diff --git a/GameServer/Server/Packet/Recv/Player/HandlerInteractChargerCsReq.cs b/GameServer/Server/Packet/Recv/MapRotation/HandlerInteractChargerCsReq.cs similarity index 79% rename from GameServer/Server/Packet/Recv/Player/HandlerInteractChargerCsReq.cs rename to GameServer/Server/Packet/Recv/MapRotation/HandlerInteractChargerCsReq.cs index 83743518..1dc364b6 100644 --- a/GameServer/Server/Packet/Recv/Player/HandlerInteractChargerCsReq.cs +++ b/GameServer/Server/Packet/Recv/MapRotation/HandlerInteractChargerCsReq.cs @@ -1,8 +1,8 @@ -using EggLink.DanhengServer.GameServer.Server.Packet.Send.Player; +using EggLink.DanhengServer.GameServer.Server.Packet.Send.MapRotation; using EggLink.DanhengServer.Kcp; using EggLink.DanhengServer.Proto; -namespace EggLink.DanhengServer.GameServer.Server.Packet.Recv.Player; +namespace EggLink.DanhengServer.GameServer.Server.Packet.Recv.MapRotation; [Opcode(CmdIds.InteractChargerCsReq)] public class HandlerInteractChargerCsReq : Handler diff --git a/GameServer/Server/Packet/Recv/Scene/HandlerLeaveMapRotationRegionCsReq.cs b/GameServer/Server/Packet/Recv/MapRotation/HandlerLeaveMapRotationRegionCsReq.cs similarity index 81% rename from GameServer/Server/Packet/Recv/Scene/HandlerLeaveMapRotationRegionCsReq.cs rename to GameServer/Server/Packet/Recv/MapRotation/HandlerLeaveMapRotationRegionCsReq.cs index 3e422dcf..f6b901c3 100644 --- a/GameServer/Server/Packet/Recv/Scene/HandlerLeaveMapRotationRegionCsReq.cs +++ b/GameServer/Server/Packet/Recv/MapRotation/HandlerLeaveMapRotationRegionCsReq.cs @@ -1,6 +1,6 @@ using EggLink.DanhengServer.Kcp; -namespace EggLink.DanhengServer.GameServer.Server.Packet.Recv.Scene; +namespace EggLink.DanhengServer.GameServer.Server.Packet.Recv.MapRotation; [Opcode(CmdIds.LeaveMapRotationRegionCsReq)] public class HandlerLeaveMapRotationRegionCsReq : Handler diff --git a/GameServer/Server/Packet/Recv/Player/HandlerRemoveRotaterCsReq.cs b/GameServer/Server/Packet/Recv/MapRotation/HandlerRemoveRotaterCsReq.cs similarity index 73% rename from GameServer/Server/Packet/Recv/Player/HandlerRemoveRotaterCsReq.cs rename to GameServer/Server/Packet/Recv/MapRotation/HandlerRemoveRotaterCsReq.cs index 7fbbe4a4..858bf97e 100644 --- a/GameServer/Server/Packet/Recv/Player/HandlerRemoveRotaterCsReq.cs +++ b/GameServer/Server/Packet/Recv/MapRotation/HandlerRemoveRotaterCsReq.cs @@ -1,8 +1,8 @@ -using EggLink.DanhengServer.GameServer.Server.Packet.Send.Player; +using EggLink.DanhengServer.GameServer.Server.Packet.Send.MapRotation; using EggLink.DanhengServer.Kcp; using EggLink.DanhengServer.Proto; -namespace EggLink.DanhengServer.GameServer.Server.Packet.Recv.Player; +namespace EggLink.DanhengServer.GameServer.Server.Packet.Recv.MapRotation; [Opcode(CmdIds.RemoveRotaterCsReq)] public class HandlerRemoveRotaterCsReq : Handler diff --git a/GameServer/Server/Packet/Recv/Mission/HandlerFinishItemIdCsReq.cs b/GameServer/Server/Packet/Recv/Message/HandlerFinishItemIdCsReq.cs similarity index 78% rename from GameServer/Server/Packet/Recv/Mission/HandlerFinishItemIdCsReq.cs rename to GameServer/Server/Packet/Recv/Message/HandlerFinishItemIdCsReq.cs index b7f7050a..19265afc 100644 --- a/GameServer/Server/Packet/Recv/Mission/HandlerFinishItemIdCsReq.cs +++ b/GameServer/Server/Packet/Recv/Message/HandlerFinishItemIdCsReq.cs @@ -1,8 +1,8 @@ -using EggLink.DanhengServer.GameServer.Server.Packet.Send.Mission; +using EggLink.DanhengServer.GameServer.Server.Packet.Send.Message; using EggLink.DanhengServer.Kcp; using EggLink.DanhengServer.Proto; -namespace EggLink.DanhengServer.GameServer.Server.Packet.Recv.Mission; +namespace EggLink.DanhengServer.GameServer.Server.Packet.Recv.Message; [Opcode(CmdIds.FinishItemIdCsReq)] public class HandlerFinishItemIdCsReq : Handler diff --git a/GameServer/Server/Packet/Recv/Mission/HandlerFinishPerformSectionIdCsReq.cs b/GameServer/Server/Packet/Recv/Message/HandlerFinishPerformSectionIdCsReq.cs similarity index 78% rename from GameServer/Server/Packet/Recv/Mission/HandlerFinishPerformSectionIdCsReq.cs rename to GameServer/Server/Packet/Recv/Message/HandlerFinishPerformSectionIdCsReq.cs index a63619b6..88d3adb7 100644 --- a/GameServer/Server/Packet/Recv/Mission/HandlerFinishPerformSectionIdCsReq.cs +++ b/GameServer/Server/Packet/Recv/Message/HandlerFinishPerformSectionIdCsReq.cs @@ -1,8 +1,8 @@ -using EggLink.DanhengServer.GameServer.Server.Packet.Send.Mission; +using EggLink.DanhengServer.GameServer.Server.Packet.Send.Message; using EggLink.DanhengServer.Kcp; using EggLink.DanhengServer.Proto; -namespace EggLink.DanhengServer.GameServer.Server.Packet.Recv.Mission; +namespace EggLink.DanhengServer.GameServer.Server.Packet.Recv.Message; [Opcode(CmdIds.FinishPerformSectionIdCsReq)] public class HandlerFinishPerformSectionIdCsReq : Handler diff --git a/GameServer/Server/Packet/Recv/Mission/HandlerFinishSectionIdCsReq.cs b/GameServer/Server/Packet/Recv/Message/HandlerFinishSectionIdCsReq.cs similarity index 77% rename from GameServer/Server/Packet/Recv/Mission/HandlerFinishSectionIdCsReq.cs rename to GameServer/Server/Packet/Recv/Message/HandlerFinishSectionIdCsReq.cs index 3f6f12ea..a760d7b5 100644 --- a/GameServer/Server/Packet/Recv/Mission/HandlerFinishSectionIdCsReq.cs +++ b/GameServer/Server/Packet/Recv/Message/HandlerFinishSectionIdCsReq.cs @@ -1,8 +1,8 @@ -using EggLink.DanhengServer.GameServer.Server.Packet.Send.Mission; +using EggLink.DanhengServer.GameServer.Server.Packet.Send.Message; using EggLink.DanhengServer.Kcp; using EggLink.DanhengServer.Proto; -namespace EggLink.DanhengServer.GameServer.Server.Packet.Recv.Mission; +namespace EggLink.DanhengServer.GameServer.Server.Packet.Recv.Message; [Opcode(CmdIds.FinishSectionIdCsReq)] public class HandlerFinishSectionIdCsReq : Handler diff --git a/GameServer/Server/Packet/Recv/Mission/HandlerGetNpcMessageGroupCsReq.cs b/GameServer/Server/Packet/Recv/Message/HandlerGetNpcMessageGroupCsReq.cs similarity index 76% rename from GameServer/Server/Packet/Recv/Mission/HandlerGetNpcMessageGroupCsReq.cs rename to GameServer/Server/Packet/Recv/Message/HandlerGetNpcMessageGroupCsReq.cs index 5a0b6f44..06099b0b 100644 --- a/GameServer/Server/Packet/Recv/Mission/HandlerGetNpcMessageGroupCsReq.cs +++ b/GameServer/Server/Packet/Recv/Message/HandlerGetNpcMessageGroupCsReq.cs @@ -1,8 +1,8 @@ -using EggLink.DanhengServer.GameServer.Server.Packet.Send.Mission; +using EggLink.DanhengServer.GameServer.Server.Packet.Send.Message; using EggLink.DanhengServer.Kcp; using EggLink.DanhengServer.Proto; -namespace EggLink.DanhengServer.GameServer.Server.Packet.Recv.Mission; +namespace EggLink.DanhengServer.GameServer.Server.Packet.Recv.Message; [Opcode(CmdIds.GetNpcMessageGroupCsReq)] public class HandlerGetNpcMessageGroupCsReq : Handler diff --git a/GameServer/Server/Packet/Recv/Mission/HandlerGetNpcStatusCsReq.cs b/GameServer/Server/Packet/Recv/Message/HandlerGetNpcStatusCsReq.cs similarity index 68% rename from GameServer/Server/Packet/Recv/Mission/HandlerGetNpcStatusCsReq.cs rename to GameServer/Server/Packet/Recv/Message/HandlerGetNpcStatusCsReq.cs index 9289ca50..e353cd34 100644 --- a/GameServer/Server/Packet/Recv/Mission/HandlerGetNpcStatusCsReq.cs +++ b/GameServer/Server/Packet/Recv/Message/HandlerGetNpcStatusCsReq.cs @@ -1,7 +1,7 @@ -using EggLink.DanhengServer.GameServer.Server.Packet.Send.Mission; +using EggLink.DanhengServer.GameServer.Server.Packet.Send.Message; using EggLink.DanhengServer.Kcp; -namespace EggLink.DanhengServer.GameServer.Server.Packet.Recv.Mission; +namespace EggLink.DanhengServer.GameServer.Server.Packet.Recv.Message; [Opcode(CmdIds.GetNpcStatusCsReq)] public class HandlerGetNpcStatusCsReq : Handler diff --git a/GameServer/Server/Packet/Recv/Player/HandlerGetPhoneDataCsReq.cs b/GameServer/Server/Packet/Recv/Phone/HandlerGetPhoneDataCsReq.cs similarity index 69% rename from GameServer/Server/Packet/Recv/Player/HandlerGetPhoneDataCsReq.cs rename to GameServer/Server/Packet/Recv/Phone/HandlerGetPhoneDataCsReq.cs index aee4efa6..cd841af5 100644 --- a/GameServer/Server/Packet/Recv/Player/HandlerGetPhoneDataCsReq.cs +++ b/GameServer/Server/Packet/Recv/Phone/HandlerGetPhoneDataCsReq.cs @@ -1,7 +1,7 @@ -using EggLink.DanhengServer.GameServer.Server.Packet.Send.Player; +using EggLink.DanhengServer.GameServer.Server.Packet.Send.Phone; using EggLink.DanhengServer.Kcp; -namespace EggLink.DanhengServer.GameServer.Server.Packet.Recv.Player; +namespace EggLink.DanhengServer.GameServer.Server.Packet.Recv.Phone; [Opcode(CmdIds.GetPhoneDataCsReq)] public class HandlerGetPhoneDataCsReq : Handler diff --git a/GameServer/Server/Packet/Recv/Player/HandlerSelectChatBubbleCsReq.cs b/GameServer/Server/Packet/Recv/Phone/HandlerSelectChatBubbleCsReq.cs similarity index 81% rename from GameServer/Server/Packet/Recv/Player/HandlerSelectChatBubbleCsReq.cs rename to GameServer/Server/Packet/Recv/Phone/HandlerSelectChatBubbleCsReq.cs index 1bf9f0d1..37d734a6 100644 --- a/GameServer/Server/Packet/Recv/Player/HandlerSelectChatBubbleCsReq.cs +++ b/GameServer/Server/Packet/Recv/Phone/HandlerSelectChatBubbleCsReq.cs @@ -1,9 +1,9 @@ using EggLink.DanhengServer.Database; -using EggLink.DanhengServer.GameServer.Server.Packet.Send.Player; +using EggLink.DanhengServer.GameServer.Server.Packet.Send.Phone; using EggLink.DanhengServer.Kcp; using EggLink.DanhengServer.Proto; -namespace EggLink.DanhengServer.GameServer.Server.Packet.Recv.Player; +namespace EggLink.DanhengServer.GameServer.Server.Packet.Recv.Phone; [Opcode(CmdIds.SelectChatBubbleCsReq)] public class HandlerSelectChatBubbleCsReq : Handler diff --git a/GameServer/Server/Packet/Recv/Player/HandlerSelectPhoneThemeCsReq.cs b/GameServer/Server/Packet/Recv/Phone/HandlerSelectPhoneThemeCsReq.cs similarity index 81% rename from GameServer/Server/Packet/Recv/Player/HandlerSelectPhoneThemeCsReq.cs rename to GameServer/Server/Packet/Recv/Phone/HandlerSelectPhoneThemeCsReq.cs index 9b70f0bf..a2a28091 100644 --- a/GameServer/Server/Packet/Recv/Player/HandlerSelectPhoneThemeCsReq.cs +++ b/GameServer/Server/Packet/Recv/Phone/HandlerSelectPhoneThemeCsReq.cs @@ -1,9 +1,9 @@ using EggLink.DanhengServer.Database; -using EggLink.DanhengServer.GameServer.Server.Packet.Send.Player; +using EggLink.DanhengServer.GameServer.Server.Packet.Send.Phone; using EggLink.DanhengServer.Kcp; using EggLink.DanhengServer.Proto; -namespace EggLink.DanhengServer.GameServer.Server.Packet.Recv.Player; +namespace EggLink.DanhengServer.GameServer.Server.Packet.Recv.Phone; [Opcode(CmdIds.SelectPhoneThemeCsReq)] public class HandlerSelectPhoneThemeCsReq : Handler diff --git a/GameServer/Server/Packet/Recv/Player/HandlerGetLevelRewardCsReq.cs b/GameServer/Server/Packet/Recv/Player/HandlerGetLevelRewardCsReq.cs index 71a270d0..f0424e77 100644 --- a/GameServer/Server/Packet/Recv/Player/HandlerGetLevelRewardCsReq.cs +++ b/GameServer/Server/Packet/Recv/Player/HandlerGetLevelRewardCsReq.cs @@ -35,4 +35,4 @@ public class HandlerGetLevelRewardCsReq : Handler var rewards = await player.InventoryManager!.HandleReward(levelExcel.LevelRewardID); await connection.SendPacket(new PacketGetLevelRewardScRsp(req.Level, rewards)); } -} +} \ No newline at end of file diff --git a/GameServer/Server/Packet/Recv/Player/HandlerGetLevelRewardTakenListCsReq.cs b/GameServer/Server/Packet/Recv/Player/HandlerGetLevelRewardTakenListCsReq.cs index 9f2cfadc..c8dcd38b 100644 --- a/GameServer/Server/Packet/Recv/Player/HandlerGetLevelRewardTakenListCsReq.cs +++ b/GameServer/Server/Packet/Recv/Player/HandlerGetLevelRewardTakenListCsReq.cs @@ -10,4 +10,4 @@ public class HandlerGetLevelRewardTakenListCsReq : Handler { await connection.SendPacket(new PacketGetLevelRewardTakenListScRsp(connection.Player!)); } -} +} \ No newline at end of file diff --git a/GameServer/Server/Packet/Recv/Avatar/HandlerGetMultiPathAvatarInfoCsReq.cs b/GameServer/Server/Packet/Recv/Player/HandlerGetMultiPathAvatarInfoCsReq.cs similarity index 76% rename from GameServer/Server/Packet/Recv/Avatar/HandlerGetMultiPathAvatarInfoCsReq.cs rename to GameServer/Server/Packet/Recv/Player/HandlerGetMultiPathAvatarInfoCsReq.cs index f2ef8290..cb52042e 100644 --- a/GameServer/Server/Packet/Recv/Avatar/HandlerGetMultiPathAvatarInfoCsReq.cs +++ b/GameServer/Server/Packet/Recv/Player/HandlerGetMultiPathAvatarInfoCsReq.cs @@ -1,7 +1,7 @@ -using EggLink.DanhengServer.GameServer.Server.Packet.Send.Avatar; +using EggLink.DanhengServer.GameServer.Server.Packet.Send.Player; using EggLink.DanhengServer.Kcp; -namespace EggLink.DanhengServer.GameServer.Server.Packet.Recv.Avatar; +namespace EggLink.DanhengServer.GameServer.Server.Packet.Recv.Player; [Opcode(CmdIds.GetMultiPathAvatarInfoCsReq)] public class HandlerGetMultiPathAvatarInfoCsReq : Handler diff --git a/GameServer/Server/Packet/Recv/Others/HandlerGetSecretKeyInfoCsReq.cs b/GameServer/Server/Packet/Recv/Player/HandlerGetSecretKeyInfoCsReq.cs similarity index 68% rename from GameServer/Server/Packet/Recv/Others/HandlerGetSecretKeyInfoCsReq.cs rename to GameServer/Server/Packet/Recv/Player/HandlerGetSecretKeyInfoCsReq.cs index 27d2c89e..2eee131b 100644 --- a/GameServer/Server/Packet/Recv/Others/HandlerGetSecretKeyInfoCsReq.cs +++ b/GameServer/Server/Packet/Recv/Player/HandlerGetSecretKeyInfoCsReq.cs @@ -1,7 +1,7 @@ -using EggLink.DanhengServer.GameServer.Server.Packet.Send.Others; +using EggLink.DanhengServer.GameServer.Server.Packet.Send.Player; using EggLink.DanhengServer.Kcp; -namespace EggLink.DanhengServer.GameServer.Server.Packet.Recv.Others; +namespace EggLink.DanhengServer.GameServer.Server.Packet.Recv.Player; [Opcode(CmdIds.GetSecretKeyInfoCsReq)] public class HandlerGetSecretKeyInfoCsReq : Handler diff --git a/GameServer/Server/Packet/Recv/Others/HandlerGetVideoVersionKeyCsReq.cs b/GameServer/Server/Packet/Recv/Player/HandlerGetVideoVersionKeyCsReq.cs similarity index 69% rename from GameServer/Server/Packet/Recv/Others/HandlerGetVideoVersionKeyCsReq.cs rename to GameServer/Server/Packet/Recv/Player/HandlerGetVideoVersionKeyCsReq.cs index 5788e919..4ec5db0e 100644 --- a/GameServer/Server/Packet/Recv/Others/HandlerGetVideoVersionKeyCsReq.cs +++ b/GameServer/Server/Packet/Recv/Player/HandlerGetVideoVersionKeyCsReq.cs @@ -1,7 +1,7 @@ -using EggLink.DanhengServer.GameServer.Server.Packet.Send.Others; +using EggLink.DanhengServer.GameServer.Server.Packet.Send.Player; using EggLink.DanhengServer.Kcp; -namespace EggLink.DanhengServer.GameServer.Server.Packet.Recv.Others; +namespace EggLink.DanhengServer.GameServer.Server.Packet.Recv.Player; [Opcode(CmdIds.GetVideoVersionKeyCsReq)] public class HandlerGetVideoVersionKeyCsReq : Handler diff --git a/GameServer/Server/Packet/Recv/Player/HandlerPlayerGetTokenCsReq.cs b/GameServer/Server/Packet/Recv/Player/HandlerPlayerGetTokenCsReq.cs index f8bcdd84..d505f2b2 100644 --- a/GameServer/Server/Packet/Recv/Player/HandlerPlayerGetTokenCsReq.cs +++ b/GameServer/Server/Packet/Recv/Player/HandlerPlayerGetTokenCsReq.cs @@ -1,7 +1,6 @@ using EggLink.DanhengServer.Database; using EggLink.DanhengServer.Database.Account; using EggLink.DanhengServer.Database.Player; -using EggLink.DanhengServer.Enums; using EggLink.DanhengServer.GameServer.Game.Player; using EggLink.DanhengServer.GameServer.Server.Packet.Send.Player; using EggLink.DanhengServer.Kcp; diff --git a/GameServer/Server/Packet/Recv/Player/HandlerPlayerLoginCsReq.cs b/GameServer/Server/Packet/Recv/Player/HandlerPlayerLoginCsReq.cs index c204f86a..7312f30c 100644 --- a/GameServer/Server/Packet/Recv/Player/HandlerPlayerLoginCsReq.cs +++ b/GameServer/Server/Packet/Recv/Player/HandlerPlayerLoginCsReq.cs @@ -1,6 +1,5 @@ -using EggLink.DanhengServer.Enums; +using EggLink.DanhengServer.GameServer.Server.Packet.Send.ContentPackage; using EggLink.DanhengServer.GameServer.Server.Packet.Send.Player; -using EggLink.DanhengServer.GameServer.Server.Packet.Send.Scene; using EggLink.DanhengServer.Kcp; namespace EggLink.DanhengServer.GameServer.Server.Packet.Recv.Player; diff --git a/GameServer/Server/Packet/Recv/Avatar/HandlerSetAvatarPathCsReq.cs b/GameServer/Server/Packet/Recv/Player/HandlerSetAvatarPathCsReq.cs similarity index 89% rename from GameServer/Server/Packet/Recv/Avatar/HandlerSetAvatarPathCsReq.cs rename to GameServer/Server/Packet/Recv/Player/HandlerSetAvatarPathCsReq.cs index d1c812d0..0955143f 100644 --- a/GameServer/Server/Packet/Recv/Avatar/HandlerSetAvatarPathCsReq.cs +++ b/GameServer/Server/Packet/Recv/Player/HandlerSetAvatarPathCsReq.cs @@ -1,10 +1,10 @@ using EggLink.DanhengServer.Data; using EggLink.DanhengServer.Enums.Avatar; -using EggLink.DanhengServer.GameServer.Server.Packet.Send.Avatar; +using EggLink.DanhengServer.GameServer.Server.Packet.Send.Player; using EggLink.DanhengServer.Kcp; using EggLink.DanhengServer.Proto; -namespace EggLink.DanhengServer.GameServer.Server.Packet.Recv.Avatar; +namespace EggLink.DanhengServer.GameServer.Server.Packet.Recv.Player; [Opcode(CmdIds.SetAvatarPathCsReq)] public class HandlerSetAvatarPathCsReq : Handler diff --git a/GameServer/Server/Packet/Recv/Player/HandlerSetNicknameCsReq.cs b/GameServer/Server/Packet/Recv/Player/HandlerSetNicknameCsReq.cs index a46ebcd1..be6f9c82 100644 --- a/GameServer/Server/Packet/Recv/Player/HandlerSetNicknameCsReq.cs +++ b/GameServer/Server/Packet/Recv/Player/HandlerSetNicknameCsReq.cs @@ -1,4 +1,4 @@ -using EggLink.DanhengServer.GameServer.Server.Packet.Send.Player; +using EggLink.DanhengServer.GameServer.Server.Packet.Send.PlayerSync; using EggLink.DanhengServer.Kcp; using EggLink.DanhengServer.Proto; diff --git a/GameServer/Server/Packet/Recv/Player/HandlerSetPlayerInfoCsReq.cs b/GameServer/Server/Packet/Recv/Player/HandlerSetPlayerInfoCsReq.cs index 0be4e358..967fa2d9 100644 --- a/GameServer/Server/Packet/Recv/Player/HandlerSetPlayerInfoCsReq.cs +++ b/GameServer/Server/Packet/Recv/Player/HandlerSetPlayerInfoCsReq.cs @@ -1,5 +1,6 @@ using EggLink.DanhengServer.Enums.Avatar; using EggLink.DanhengServer.GameServer.Server.Packet.Send.Player; +using EggLink.DanhengServer.GameServer.Server.Packet.Send.PlayerSync; using EggLink.DanhengServer.Kcp; using EggLink.DanhengServer.Proto; diff --git a/GameServer/Server/Packet/Recv/Player/HandlerUseItemCsReq.cs b/GameServer/Server/Packet/Recv/Player/HandlerUseItemCsReq.cs deleted file mode 100644 index dd480fd3..00000000 --- a/GameServer/Server/Packet/Recv/Player/HandlerUseItemCsReq.cs +++ /dev/null @@ -1,15 +0,0 @@ -using EggLink.DanhengServer.Kcp; -using EggLink.DanhengServer.Proto; - -namespace EggLink.DanhengServer.GameServer.Server.Packet.Recv.Player; - -[Opcode(CmdIds.UseItemCsReq)] -public class HandlerUseItemCsReq : Handler -{ - public override async Task OnHandle(Connection connection, byte[] header, byte[] data) - { - var req = UseItemCsReq.Parser.ParseFrom(data); - - await connection.SendPacket(CmdIds.UseItemScRsp); - } -} \ No newline at end of file diff --git a/GameServer/Server/Packet/Recv/Player/HandlerGetPlayerBoardDataCsReq.cs b/GameServer/Server/Packet/Recv/PlayerBoard/HandlerGetPlayerBoardDataCsReq.cs similarity index 95% rename from GameServer/Server/Packet/Recv/Player/HandlerGetPlayerBoardDataCsReq.cs rename to GameServer/Server/Packet/Recv/PlayerBoard/HandlerGetPlayerBoardDataCsReq.cs index 8b321629..36cfa97b 100644 --- a/GameServer/Server/Packet/Recv/Player/HandlerGetPlayerBoardDataCsReq.cs +++ b/GameServer/Server/Packet/Recv/PlayerBoard/HandlerGetPlayerBoardDataCsReq.cs @@ -1,7 +1,7 @@ -using EggLink.DanhengServer.GameServer.Server.Packet.Send.Player; +using EggLink.DanhengServer.GameServer.Server.Packet.Send.PlayerBoard; using EggLink.DanhengServer.Kcp; -namespace EggLink.DanhengServer.GameServer.Server.Packet.Recv.Player; +namespace EggLink.DanhengServer.GameServer.Server.Packet.Recv.PlayerBoard; [Opcode(CmdIds.GetPlayerBoardDataCsReq)] public class HandlerGetPlayerBoardDataCsReq : Handler diff --git a/GameServer/Server/Packet/Recv/Avatar/HandlerSetAssistAvatarCsReq.cs b/GameServer/Server/Packet/Recv/PlayerBoard/HandlerSetAssistAvatarCsReq.cs similarity index 82% rename from GameServer/Server/Packet/Recv/Avatar/HandlerSetAssistAvatarCsReq.cs rename to GameServer/Server/Packet/Recv/PlayerBoard/HandlerSetAssistAvatarCsReq.cs index 54e9b6c9..4f6fdb4b 100644 --- a/GameServer/Server/Packet/Recv/Avatar/HandlerSetAssistAvatarCsReq.cs +++ b/GameServer/Server/Packet/Recv/PlayerBoard/HandlerSetAssistAvatarCsReq.cs @@ -1,8 +1,8 @@ -using EggLink.DanhengServer.GameServer.Server.Packet.Send.Avatar; +using EggLink.DanhengServer.GameServer.Server.Packet.Send.PlayerBoard; using EggLink.DanhengServer.Kcp; using EggLink.DanhengServer.Proto; -namespace EggLink.DanhengServer.GameServer.Server.Packet.Recv.Avatar; +namespace EggLink.DanhengServer.GameServer.Server.Packet.Recv.PlayerBoard; [Opcode(CmdIds.SetAssistAvatarCsReq)] public class HandlerSetAssistAvatarCsReq : Handler diff --git a/GameServer/Server/Packet/Recv/Avatar/HandlerSetDisplayAvatarCsReq.cs b/GameServer/Server/Packet/Recv/PlayerBoard/HandlerSetDisplayAvatarCsReq.cs similarity index 82% rename from GameServer/Server/Packet/Recv/Avatar/HandlerSetDisplayAvatarCsReq.cs rename to GameServer/Server/Packet/Recv/PlayerBoard/HandlerSetDisplayAvatarCsReq.cs index beadcf1b..e3cce34d 100644 --- a/GameServer/Server/Packet/Recv/Avatar/HandlerSetDisplayAvatarCsReq.cs +++ b/GameServer/Server/Packet/Recv/PlayerBoard/HandlerSetDisplayAvatarCsReq.cs @@ -1,8 +1,8 @@ -using EggLink.DanhengServer.GameServer.Server.Packet.Send.Avatar; +using EggLink.DanhengServer.GameServer.Server.Packet.Send.PlayerBoard; using EggLink.DanhengServer.Kcp; using EggLink.DanhengServer.Proto; -namespace EggLink.DanhengServer.GameServer.Server.Packet.Recv.Avatar; +namespace EggLink.DanhengServer.GameServer.Server.Packet.Recv.PlayerBoard; [Opcode(CmdIds.SetDisplayAvatarCsReq)] public class HandlerSetDisplayAvatarCsReq : Handler diff --git a/GameServer/Server/Packet/Recv/Player/HandlerSetHeadIconCsReq.cs b/GameServer/Server/Packet/Recv/PlayerBoard/HandlerSetHeadIconCsReq.cs similarity index 96% rename from GameServer/Server/Packet/Recv/Player/HandlerSetHeadIconCsReq.cs rename to GameServer/Server/Packet/Recv/PlayerBoard/HandlerSetHeadIconCsReq.cs index 62d5f0a0..48d17fae 100644 --- a/GameServer/Server/Packet/Recv/Player/HandlerSetHeadIconCsReq.cs +++ b/GameServer/Server/Packet/Recv/PlayerBoard/HandlerSetHeadIconCsReq.cs @@ -1,8 +1,8 @@ -using EggLink.DanhengServer.GameServer.Server.Packet.Send.Player; +using EggLink.DanhengServer.GameServer.Server.Packet.Send.PlayerBoard; using EggLink.DanhengServer.Kcp; using EggLink.DanhengServer.Proto; -namespace EggLink.DanhengServer.GameServer.Server.Packet.Recv.Player; +namespace EggLink.DanhengServer.GameServer.Server.Packet.Recv.PlayerBoard; [Opcode(CmdIds.SetHeadIconCsReq)] public class HandlerSetHeadIconCsReq : Handler diff --git a/GameServer/Server/Packet/Recv/Player/HandlerSetSignatureCsReq.cs b/GameServer/Server/Packet/Recv/PlayerBoard/HandlerSetSignatureCsReq.cs similarity index 96% rename from GameServer/Server/Packet/Recv/Player/HandlerSetSignatureCsReq.cs rename to GameServer/Server/Packet/Recv/PlayerBoard/HandlerSetSignatureCsReq.cs index 599fdc37..e9d3e6f5 100644 --- a/GameServer/Server/Packet/Recv/Player/HandlerSetSignatureCsReq.cs +++ b/GameServer/Server/Packet/Recv/PlayerBoard/HandlerSetSignatureCsReq.cs @@ -1,8 +1,8 @@ -using EggLink.DanhengServer.GameServer.Server.Packet.Send.Player; +using EggLink.DanhengServer.GameServer.Server.Packet.Send.PlayerBoard; using EggLink.DanhengServer.Kcp; using EggLink.DanhengServer.Proto; -namespace EggLink.DanhengServer.GameServer.Server.Packet.Recv.Player; +namespace EggLink.DanhengServer.GameServer.Server.Packet.Recv.PlayerBoard; [Opcode(CmdIds.SetSignatureCsReq)] public class HandlerSetSignatureCsReq : Handler diff --git a/GameServer/Server/Packet/Recv/Mission/HandlerGetRndOptionCsReq.cs b/GameServer/Server/Packet/Recv/RndOption/HandlerGetRndOptionCsReq.cs similarity index 79% rename from GameServer/Server/Packet/Recv/Mission/HandlerGetRndOptionCsReq.cs rename to GameServer/Server/Packet/Recv/RndOption/HandlerGetRndOptionCsReq.cs index 8338dda6..2a49b14d 100644 --- a/GameServer/Server/Packet/Recv/Mission/HandlerGetRndOptionCsReq.cs +++ b/GameServer/Server/Packet/Recv/RndOption/HandlerGetRndOptionCsReq.cs @@ -1,6 +1,6 @@ using EggLink.DanhengServer.Kcp; -namespace EggLink.DanhengServer.GameServer.Server.Packet.Recv.Mission; +namespace EggLink.DanhengServer.GameServer.Server.Packet.Recv.RndOption; [Opcode(CmdIds.GetRndOptionCsReq)] public class HandlerGetRndOptionCsReq : Handler diff --git a/GameServer/Server/Packet/Recv/Rogue/HandlerFinishRogueCommonDialogueCsReq.cs b/GameServer/Server/Packet/Recv/RogueCommon/HandlerFinishRogueCommonDialogueCsReq.cs similarity index 98% rename from GameServer/Server/Packet/Recv/Rogue/HandlerFinishRogueCommonDialogueCsReq.cs rename to GameServer/Server/Packet/Recv/RogueCommon/HandlerFinishRogueCommonDialogueCsReq.cs index fa8bfe22..c0f96558 100644 --- a/GameServer/Server/Packet/Recv/Rogue/HandlerFinishRogueCommonDialogueCsReq.cs +++ b/GameServer/Server/Packet/Recv/RogueCommon/HandlerFinishRogueCommonDialogueCsReq.cs @@ -1,7 +1,7 @@ using EggLink.DanhengServer.Kcp; using EggLink.DanhengServer.Proto; -namespace EggLink.DanhengServer.GameServer.Server.Packet.Recv.Rogue; +namespace EggLink.DanhengServer.GameServer.Server.Packet.Recv.RogueCommon; [Opcode(CmdIds.FinishRogueCommonDialogueCsReq)] public class HandlerFinishRogueCommonDialogueCsReq : Handler diff --git a/GameServer/Server/Packet/Recv/Rogue/HandlerGetRogueHandbookDataCsReq.cs b/GameServer/Server/Packet/Recv/RogueCommon/HandlerGetRogueHandbookDataCsReq.cs similarity index 95% rename from GameServer/Server/Packet/Recv/Rogue/HandlerGetRogueHandbookDataCsReq.cs rename to GameServer/Server/Packet/Recv/RogueCommon/HandlerGetRogueHandbookDataCsReq.cs index d0343e2d..fc9761b0 100644 --- a/GameServer/Server/Packet/Recv/Rogue/HandlerGetRogueHandbookDataCsReq.cs +++ b/GameServer/Server/Packet/Recv/RogueCommon/HandlerGetRogueHandbookDataCsReq.cs @@ -1,7 +1,7 @@ -using EggLink.DanhengServer.GameServer.Server.Packet.Send.Rogue; +using EggLink.DanhengServer.GameServer.Server.Packet.Send.RogueCommon; using EggLink.DanhengServer.Kcp; -namespace EggLink.DanhengServer.GameServer.Server.Packet.Recv.Rogue; +namespace EggLink.DanhengServer.GameServer.Server.Packet.Recv.RogueCommon; [Opcode(CmdIds.GetRogueHandbookDataCsReq)] public class HandlerGetRogueHandbookDataCsReq : Handler diff --git a/GameServer/Server/Packet/Recv/Rogue/HandlerHandleRogueCommonPendingActionCsReq.cs b/GameServer/Server/Packet/Recv/RogueCommon/HandlerHandleRogueCommonPendingActionCsReq.cs similarity index 98% rename from GameServer/Server/Packet/Recv/Rogue/HandlerHandleRogueCommonPendingActionCsReq.cs rename to GameServer/Server/Packet/Recv/RogueCommon/HandlerHandleRogueCommonPendingActionCsReq.cs index dfde0d85..35e408c9 100644 --- a/GameServer/Server/Packet/Recv/Rogue/HandlerHandleRogueCommonPendingActionCsReq.cs +++ b/GameServer/Server/Packet/Recv/RogueCommon/HandlerHandleRogueCommonPendingActionCsReq.cs @@ -1,7 +1,7 @@ using EggLink.DanhengServer.Kcp; using EggLink.DanhengServer.Proto; -namespace EggLink.DanhengServer.GameServer.Server.Packet.Recv.Rogue; +namespace EggLink.DanhengServer.GameServer.Server.Packet.Recv.RogueCommon; [Opcode(CmdIds.HandleRogueCommonPendingActionCsReq)] public class HandlerHandleRogueCommonPendingActionCsReq : Handler diff --git a/GameServer/Server/Packet/Recv/Rogue/HandlerSelectRogueCommonDialogueOptionCsReq.cs b/GameServer/Server/Packet/Recv/RogueCommon/HandlerSelectRogueCommonDialogueOptionCsReq.cs similarity index 98% rename from GameServer/Server/Packet/Recv/Rogue/HandlerSelectRogueCommonDialogueOptionCsReq.cs rename to GameServer/Server/Packet/Recv/RogueCommon/HandlerSelectRogueCommonDialogueOptionCsReq.cs index 4550b5d7..506fad36 100644 --- a/GameServer/Server/Packet/Recv/Rogue/HandlerSelectRogueCommonDialogueOptionCsReq.cs +++ b/GameServer/Server/Packet/Recv/RogueCommon/HandlerSelectRogueCommonDialogueOptionCsReq.cs @@ -1,7 +1,7 @@ using EggLink.DanhengServer.Kcp; using EggLink.DanhengServer.Proto; -namespace EggLink.DanhengServer.GameServer.Server.Packet.Recv.Rogue; +namespace EggLink.DanhengServer.GameServer.Server.Packet.Recv.RogueCommon; [Opcode(CmdIds.SelectRogueCommonDialogueOptionCsReq)] public class HandlerSelectRogueCommonDialogueOptionCsReq : Handler diff --git a/GameServer/Server/Packet/Recv/Shop/HandlerDoGachaInRollShopCsReq.cs b/GameServer/Server/Packet/Recv/RollShop/HandlerDoGachaInRollShopCsReq.cs similarity index 94% rename from GameServer/Server/Packet/Recv/Shop/HandlerDoGachaInRollShopCsReq.cs rename to GameServer/Server/Packet/Recv/RollShop/HandlerDoGachaInRollShopCsReq.cs index aacb7364..e3234209 100644 --- a/GameServer/Server/Packet/Recv/Shop/HandlerDoGachaInRollShopCsReq.cs +++ b/GameServer/Server/Packet/Recv/RollShop/HandlerDoGachaInRollShopCsReq.cs @@ -1,11 +1,11 @@ using EggLink.DanhengServer.Data; using EggLink.DanhengServer.Database.Inventory; -using EggLink.DanhengServer.GameServer.Server.Packet.Send.Shop; +using EggLink.DanhengServer.GameServer.Server.Packet.Send.RollShop; using EggLink.DanhengServer.Kcp; using EggLink.DanhengServer.Proto; using EggLink.DanhengServer.Util; -namespace EggLink.DanhengServer.GameServer.Server.Packet.Recv.Shop; +namespace EggLink.DanhengServer.GameServer.Server.Packet.Recv.RollShop; [Opcode(CmdIds.DoGachaInRollShopCsReq)] public class HandlerDoGachaInRollShopCsReq : Handler diff --git a/GameServer/Server/Packet/Recv/Shop/HandlerGetRollShopInfoCsReq.cs b/GameServer/Server/Packet/Recv/RollShop/HandlerGetRollShopInfoCsReq.cs similarity index 74% rename from GameServer/Server/Packet/Recv/Shop/HandlerGetRollShopInfoCsReq.cs rename to GameServer/Server/Packet/Recv/RollShop/HandlerGetRollShopInfoCsReq.cs index d76fdef0..9956718f 100644 --- a/GameServer/Server/Packet/Recv/Shop/HandlerGetRollShopInfoCsReq.cs +++ b/GameServer/Server/Packet/Recv/RollShop/HandlerGetRollShopInfoCsReq.cs @@ -1,8 +1,8 @@ -using EggLink.DanhengServer.GameServer.Server.Packet.Send.Shop; +using EggLink.DanhengServer.GameServer.Server.Packet.Send.RollShop; using EggLink.DanhengServer.Kcp; using EggLink.DanhengServer.Proto; -namespace EggLink.DanhengServer.GameServer.Server.Packet.Recv.Shop; +namespace EggLink.DanhengServer.GameServer.Server.Packet.Recv.RollShop; [Opcode(CmdIds.GetRollShopInfoCsReq)] public class HandlerGetRollShopInfoCsReq : Handler diff --git a/GameServer/Server/Packet/Recv/Lineup/HandlerSceneCastSkillCostMpCsReq.cs b/GameServer/Server/Packet/Recv/Scene/HandlerSceneCastSkillCostMpCsReq.cs similarity index 79% rename from GameServer/Server/Packet/Recv/Lineup/HandlerSceneCastSkillCostMpCsReq.cs rename to GameServer/Server/Packet/Recv/Scene/HandlerSceneCastSkillCostMpCsReq.cs index c10115ed..6acde2a3 100644 --- a/GameServer/Server/Packet/Recv/Lineup/HandlerSceneCastSkillCostMpCsReq.cs +++ b/GameServer/Server/Packet/Recv/Scene/HandlerSceneCastSkillCostMpCsReq.cs @@ -1,8 +1,8 @@ -using EggLink.DanhengServer.GameServer.Server.Packet.Send.Lineup; +using EggLink.DanhengServer.GameServer.Server.Packet.Send.Scene; using EggLink.DanhengServer.Kcp; using EggLink.DanhengServer.Proto; -namespace EggLink.DanhengServer.GameServer.Server.Packet.Recv.Lineup; +namespace EggLink.DanhengServer.GameServer.Server.Packet.Recv.Scene; [Opcode(CmdIds.SceneCastSkillCostMpCsReq)] public class HandlerSceneCastSkillCostMpCsReq : Handler diff --git a/GameServer/Server/Packet/Recv/Battle/HandlerSceneCastSkillCsReq.cs b/GameServer/Server/Packet/Recv/Scene/HandlerSceneCastSkillCsReq.cs similarity index 94% rename from GameServer/Server/Packet/Recv/Battle/HandlerSceneCastSkillCsReq.cs rename to GameServer/Server/Packet/Recv/Scene/HandlerSceneCastSkillCsReq.cs index 721e9723..68dba3ab 100644 --- a/GameServer/Server/Packet/Recv/Battle/HandlerSceneCastSkillCsReq.cs +++ b/GameServer/Server/Packet/Recv/Scene/HandlerSceneCastSkillCsReq.cs @@ -1,9 +1,9 @@ using EggLink.DanhengServer.GameServer.Game.Battle.Skill; -using EggLink.DanhengServer.GameServer.Server.Packet.Send.Battle; +using EggLink.DanhengServer.GameServer.Server.Packet.Send.Scene; using EggLink.DanhengServer.Kcp; using EggLink.DanhengServer.Proto; -namespace EggLink.DanhengServer.GameServer.Server.Packet.Recv.Battle; +namespace EggLink.DanhengServer.GameServer.Server.Packet.Recv.Scene; [Opcode(CmdIds.SceneCastSkillCsReq)] public class HandlerSceneCastSkillCsReq : Handler diff --git a/GameServer/Server/Packet/Recv/Battle/HandlerSceneEnterStageCsReq.cs b/GameServer/Server/Packet/Recv/Scene/HandlerSceneEnterStageCsReq.cs similarity index 86% rename from GameServer/Server/Packet/Recv/Battle/HandlerSceneEnterStageCsReq.cs rename to GameServer/Server/Packet/Recv/Scene/HandlerSceneEnterStageCsReq.cs index 9c259ac6..4d774049 100644 --- a/GameServer/Server/Packet/Recv/Battle/HandlerSceneEnterStageCsReq.cs +++ b/GameServer/Server/Packet/Recv/Scene/HandlerSceneEnterStageCsReq.cs @@ -1,7 +1,7 @@ using EggLink.DanhengServer.Kcp; using EggLink.DanhengServer.Proto; -namespace EggLink.DanhengServer.GameServer.Server.Packet.Recv.Battle; +namespace EggLink.DanhengServer.GameServer.Server.Packet.Recv.Scene; [Opcode(CmdIds.SceneEnterStageCsReq)] public class HandlerSceneEnterStageCsReq : Handler diff --git a/GameServer/Server/Packet/Recv/Player/HandlerSetClientPausedCsReq.cs b/GameServer/Server/Packet/Recv/Scene/HandlerSetClientPausedCsReq.cs similarity index 75% rename from GameServer/Server/Packet/Recv/Player/HandlerSetClientPausedCsReq.cs rename to GameServer/Server/Packet/Recv/Scene/HandlerSetClientPausedCsReq.cs index 383d3d1e..948fe362 100644 --- a/GameServer/Server/Packet/Recv/Player/HandlerSetClientPausedCsReq.cs +++ b/GameServer/Server/Packet/Recv/Scene/HandlerSetClientPausedCsReq.cs @@ -1,10 +1,10 @@ -using EggLink.DanhengServer.GameServer.Server.Packet.Send.Others; -using EggLink.DanhengServer.GameServer.Server.Packet.Send.Player; +using EggLink.DanhengServer.GameServer.Server.Packet.Send.Player; +using EggLink.DanhengServer.GameServer.Server.Packet.Send.Scene; using EggLink.DanhengServer.Kcp; using EggLink.DanhengServer.Proto; using EggLink.DanhengServer.Util; -namespace EggLink.DanhengServer.GameServer.Server.Packet.Recv.Player; +namespace EggLink.DanhengServer.GameServer.Server.Packet.Recv.Scene; [Opcode(CmdIds.SetClientPausedCsReq)] public class HandlerSetClientPausedCsReq : Handler diff --git a/GameServer/Server/Packet/Recv/Battle/HandlerStartCocoonStageCsReq.cs b/GameServer/Server/Packet/Recv/Scene/HandlerStartCocoonStageCsReq.cs similarity index 86% rename from GameServer/Server/Packet/Recv/Battle/HandlerStartCocoonStageCsReq.cs rename to GameServer/Server/Packet/Recv/Scene/HandlerStartCocoonStageCsReq.cs index 4363fd1b..18329ab6 100644 --- a/GameServer/Server/Packet/Recv/Battle/HandlerStartCocoonStageCsReq.cs +++ b/GameServer/Server/Packet/Recv/Scene/HandlerStartCocoonStageCsReq.cs @@ -1,7 +1,7 @@ using EggLink.DanhengServer.Kcp; using EggLink.DanhengServer.Proto; -namespace EggLink.DanhengServer.GameServer.Server.Packet.Recv.Battle; +namespace EggLink.DanhengServer.GameServer.Server.Packet.Recv.Scene; [Opcode(CmdIds.StartCocoonStageCsReq)] public class HandlerStartCocoonStageCsReq : Handler diff --git a/GameServer/Server/Packet/Recv/Mission/HandlerGetStoryLineInfoCsReq.cs b/GameServer/Server/Packet/Recv/StoryLine/HandlerGetStoryLineInfoCsReq.cs similarity index 68% rename from GameServer/Server/Packet/Recv/Mission/HandlerGetStoryLineInfoCsReq.cs rename to GameServer/Server/Packet/Recv/StoryLine/HandlerGetStoryLineInfoCsReq.cs index 1acca02d..41c71a7c 100644 --- a/GameServer/Server/Packet/Recv/Mission/HandlerGetStoryLineInfoCsReq.cs +++ b/GameServer/Server/Packet/Recv/StoryLine/HandlerGetStoryLineInfoCsReq.cs @@ -1,7 +1,7 @@ -using EggLink.DanhengServer.GameServer.Server.Packet.Send.Mission; +using EggLink.DanhengServer.GameServer.Server.Packet.Send.StoryLine; using EggLink.DanhengServer.Kcp; -namespace EggLink.DanhengServer.GameServer.Server.Packet.Recv.Mission; +namespace EggLink.DanhengServer.GameServer.Server.Packet.Recv.StoryLine; [Opcode(CmdIds.GetStoryLineInfoCsReq)] public class HandlerGetStoryLineInfoCsReq : Handler diff --git a/GameServer/Server/Packet/Recv/Scene/HandlerGetFirstTalkByPerformanceNpcCsReq.cs b/GameServer/Server/Packet/Recv/TalkEvent/HandlerGetFirstTalkByPerformanceNpcCsReq.cs similarity index 75% rename from GameServer/Server/Packet/Recv/Scene/HandlerGetFirstTalkByPerformanceNpcCsReq.cs rename to GameServer/Server/Packet/Recv/TalkEvent/HandlerGetFirstTalkByPerformanceNpcCsReq.cs index e5d9699a..57974875 100644 --- a/GameServer/Server/Packet/Recv/Scene/HandlerGetFirstTalkByPerformanceNpcCsReq.cs +++ b/GameServer/Server/Packet/Recv/TalkEvent/HandlerGetFirstTalkByPerformanceNpcCsReq.cs @@ -1,8 +1,8 @@ -using EggLink.DanhengServer.GameServer.Server.Packet.Send.Scene; +using EggLink.DanhengServer.GameServer.Server.Packet.Send.TalkEvent; using EggLink.DanhengServer.Kcp; using EggLink.DanhengServer.Proto; -namespace EggLink.DanhengServer.GameServer.Server.Packet.Recv.Scene; +namespace EggLink.DanhengServer.GameServer.Server.Packet.Recv.TalkEvent; [Opcode(CmdIds.GetFirstTalkByPerformanceNpcCsReq)] public class HandlerGetFirstTalkByPerformanceNpcCsReq : Handler diff --git a/GameServer/Server/Packet/Recv/Mission/HandlerGetFirstTalkNpcCsReq.cs b/GameServer/Server/Packet/Recv/TalkEvent/HandlerGetFirstTalkNpcCsReq.cs similarity index 80% rename from GameServer/Server/Packet/Recv/Mission/HandlerGetFirstTalkNpcCsReq.cs rename to GameServer/Server/Packet/Recv/TalkEvent/HandlerGetFirstTalkNpcCsReq.cs index 9287afc1..40b923e1 100644 --- a/GameServer/Server/Packet/Recv/Mission/HandlerGetFirstTalkNpcCsReq.cs +++ b/GameServer/Server/Packet/Recv/TalkEvent/HandlerGetFirstTalkNpcCsReq.cs @@ -1,6 +1,6 @@ using EggLink.DanhengServer.Kcp; -namespace EggLink.DanhengServer.GameServer.Server.Packet.Recv.Mission; +namespace EggLink.DanhengServer.GameServer.Server.Packet.Recv.TalkEvent; [Opcode(CmdIds.GetFirstTalkNpcCsReq)] public class HandlerGetFirstTalkNpcCsReq : Handler diff --git a/GameServer/Server/Packet/Recv/Scene/HandlerGetNpcTakenRewardCsReq.cs b/GameServer/Server/Packet/Recv/TalkEvent/HandlerGetNpcTakenRewardCsReq.cs similarity index 74% rename from GameServer/Server/Packet/Recv/Scene/HandlerGetNpcTakenRewardCsReq.cs rename to GameServer/Server/Packet/Recv/TalkEvent/HandlerGetNpcTakenRewardCsReq.cs index 7076fc95..d69c89cd 100644 --- a/GameServer/Server/Packet/Recv/Scene/HandlerGetNpcTakenRewardCsReq.cs +++ b/GameServer/Server/Packet/Recv/TalkEvent/HandlerGetNpcTakenRewardCsReq.cs @@ -1,8 +1,8 @@ -using EggLink.DanhengServer.GameServer.Server.Packet.Send.Scene; +using EggLink.DanhengServer.GameServer.Server.Packet.Send.TalkEvent; using EggLink.DanhengServer.Kcp; using EggLink.DanhengServer.Proto; -namespace EggLink.DanhengServer.GameServer.Server.Packet.Recv.Scene; +namespace EggLink.DanhengServer.GameServer.Server.Packet.Recv.TalkEvent; [Opcode(CmdIds.GetNpcTakenRewardCsReq)] public class HandlerGetNpcTakenRewardCsReq : Handler diff --git a/GameServer/Server/Packet/Recv/Mission/HandlerSelectInclinationTextCsReq.cs b/GameServer/Server/Packet/Recv/TalkEvent/HandlerSelectInclinationTextCsReq.cs similarity index 75% rename from GameServer/Server/Packet/Recv/Mission/HandlerSelectInclinationTextCsReq.cs rename to GameServer/Server/Packet/Recv/TalkEvent/HandlerSelectInclinationTextCsReq.cs index d8b2d4cb..c4d8d393 100644 --- a/GameServer/Server/Packet/Recv/Mission/HandlerSelectInclinationTextCsReq.cs +++ b/GameServer/Server/Packet/Recv/TalkEvent/HandlerSelectInclinationTextCsReq.cs @@ -1,8 +1,8 @@ -using EggLink.DanhengServer.GameServer.Server.Packet.Send.Mission; +using EggLink.DanhengServer.GameServer.Server.Packet.Send.TalkEvent; using EggLink.DanhengServer.Kcp; using EggLink.DanhengServer.Proto; -namespace EggLink.DanhengServer.GameServer.Server.Packet.Recv.Mission; +namespace EggLink.DanhengServer.GameServer.Server.Packet.Recv.TalkEvent; [Opcode(CmdIds.SelectInclinationTextCsReq)] public class HandlerSelectInclinationTextCsReq : Handler diff --git a/GameServer/Server/Packet/Recv/Tutorial/HandlerGetTutorialCsReq.cs b/GameServer/Server/Packet/Recv/Tutorial/HandlerGetTutorialCsReq.cs index 0c673563..2b388122 100644 --- a/GameServer/Server/Packet/Recv/Tutorial/HandlerGetTutorialCsReq.cs +++ b/GameServer/Server/Packet/Recv/Tutorial/HandlerGetTutorialCsReq.cs @@ -1,5 +1,4 @@ -using EggLink.DanhengServer.GameServer.Server.Packet.Send.Others; -using EggLink.DanhengServer.GameServer.Server.Packet.Send.Tutorial; +using EggLink.DanhengServer.GameServer.Server.Packet.Send.Tutorial; using EggLink.DanhengServer.Kcp; using EggLink.DanhengServer.Util; diff --git a/GameServer/Server/Packet/Send/Player/PacketGetArchiveDataScRsp.cs b/GameServer/Server/Packet/Send/Archive/PacketGetArchiveDataScRsp.cs similarity index 95% rename from GameServer/Server/Packet/Send/Player/PacketGetArchiveDataScRsp.cs rename to GameServer/Server/Packet/Send/Archive/PacketGetArchiveDataScRsp.cs index e002f06c..2092e166 100644 --- a/GameServer/Server/Packet/Send/Player/PacketGetArchiveDataScRsp.cs +++ b/GameServer/Server/Packet/Send/Archive/PacketGetArchiveDataScRsp.cs @@ -3,7 +3,7 @@ using EggLink.DanhengServer.GameServer.Game.Player; using EggLink.DanhengServer.Kcp; using EggLink.DanhengServer.Proto; -namespace EggLink.DanhengServer.GameServer.Server.Packet.Send.Player; +namespace EggLink.DanhengServer.GameServer.Server.Packet.Send.Archive; public class PacketGetArchiveDataScRsp : BasePacket { diff --git a/GameServer/Server/Packet/Send/Avatar/PacketTakePromotionRewardScRsp.cs b/GameServer/Server/Packet/Send/Avatar/PacketTakePromotionRewardScRsp.cs index 9c7388b0..7a316733 100644 --- a/GameServer/Server/Packet/Send/Avatar/PacketTakePromotionRewardScRsp.cs +++ b/GameServer/Server/Packet/Send/Avatar/PacketTakePromotionRewardScRsp.cs @@ -7,7 +7,7 @@ public class PacketTakePromotionRewardScRsp : BasePacket { public PacketTakePromotionRewardScRsp() : base(CmdIds.TakePromotionRewardScRsp) { - var itemList = new Item + var itemList = new Proto.Item { ItemId = 101, Num = 1 diff --git a/GameServer/Server/Packet/Send/Challenge/PacketStartChallengeScRsp.cs b/GameServer/Server/Packet/Send/Challenge/PacketStartChallengeScRsp.cs index c5751ad7..099d7190 100644 --- a/GameServer/Server/Packet/Send/Challenge/PacketStartChallengeScRsp.cs +++ b/GameServer/Server/Packet/Send/Challenge/PacketStartChallengeScRsp.cs @@ -25,10 +25,7 @@ public class PacketStartChallengeScRsp : BasePacket proto.CurChallenge = player.ChallengeManager.ChallengeInstance.ToProto(); proto.LineupList.Add(player.LineupManager!.GetExtraLineup(ExtraLineupType.LineupChallenge)!.ToProto()); proto.LineupList.Add(player.LineupManager!.GetExtraLineup(ExtraLineupType.LineupChallenge2)!.ToProto()); - if (sendScene) - { - proto.Scene = player.SceneInstance!.ToProto(); - } + if (sendScene) proto.Scene = player.SceneInstance!.ToProto(); } else { diff --git a/GameServer/Server/Packet/Send/Friend/PacketGetPrivateChatHistoryScRsp.cs b/GameServer/Server/Packet/Send/Chat/PacketGetPrivateChatHistoryScRsp.cs similarity index 89% rename from GameServer/Server/Packet/Send/Friend/PacketGetPrivateChatHistoryScRsp.cs rename to GameServer/Server/Packet/Send/Chat/PacketGetPrivateChatHistoryScRsp.cs index 51f2704b..c3664dbc 100644 --- a/GameServer/Server/Packet/Send/Friend/PacketGetPrivateChatHistoryScRsp.cs +++ b/GameServer/Server/Packet/Send/Chat/PacketGetPrivateChatHistoryScRsp.cs @@ -2,7 +2,7 @@ using EggLink.DanhengServer.Kcp; using EggLink.DanhengServer.Proto; -namespace EggLink.DanhengServer.GameServer.Server.Packet.Send.Friend; +namespace EggLink.DanhengServer.GameServer.Server.Packet.Send.Chat; public class PacketGetPrivateChatHistoryScRsp : BasePacket { diff --git a/GameServer/Server/Packet/Send/Friend/PacketRevcMsgScNotify.cs b/GameServer/Server/Packet/Send/Chat/PacketRevcMsgScNotify.cs similarity index 92% rename from GameServer/Server/Packet/Send/Friend/PacketRevcMsgScNotify.cs rename to GameServer/Server/Packet/Send/Chat/PacketRevcMsgScNotify.cs index 7d9facec..9cdd370b 100644 --- a/GameServer/Server/Packet/Send/Friend/PacketRevcMsgScNotify.cs +++ b/GameServer/Server/Packet/Send/Chat/PacketRevcMsgScNotify.cs @@ -1,7 +1,7 @@ using EggLink.DanhengServer.Kcp; using EggLink.DanhengServer.Proto; -namespace EggLink.DanhengServer.GameServer.Server.Packet.Send.Friend; +namespace EggLink.DanhengServer.GameServer.Server.Packet.Send.Chat; public class PacketRevcMsgScNotify : BasePacket { diff --git a/GameServer/Server/Packet/Send/Scene/PacketContentPackageGetDataScRsp.cs b/GameServer/Server/Packet/Send/ContentPackage/PacketContentPackageGetDataScRsp.cs similarity index 90% rename from GameServer/Server/Packet/Send/Scene/PacketContentPackageGetDataScRsp.cs rename to GameServer/Server/Packet/Send/ContentPackage/PacketContentPackageGetDataScRsp.cs index ba118589..b60b7b4d 100644 --- a/GameServer/Server/Packet/Send/Scene/PacketContentPackageGetDataScRsp.cs +++ b/GameServer/Server/Packet/Send/ContentPackage/PacketContentPackageGetDataScRsp.cs @@ -2,7 +2,7 @@ using EggLink.DanhengServer.Kcp; using EggLink.DanhengServer.Proto; -namespace EggLink.DanhengServer.GameServer.Server.Packet.Send.Scene; +namespace EggLink.DanhengServer.GameServer.Server.Packet.Send.ContentPackage; public class PacketContentPackageGetDataScRsp : BasePacket { diff --git a/GameServer/Server/Packet/Send/Scene/PacketContentPackageSyncDataScNotify.cs b/GameServer/Server/Packet/Send/ContentPackage/PacketContentPackageSyncDataScNotify.cs similarity index 90% rename from GameServer/Server/Packet/Send/Scene/PacketContentPackageSyncDataScNotify.cs rename to GameServer/Server/Packet/Send/ContentPackage/PacketContentPackageSyncDataScNotify.cs index d7c8b89b..cd518864 100644 --- a/GameServer/Server/Packet/Send/Scene/PacketContentPackageSyncDataScNotify.cs +++ b/GameServer/Server/Packet/Send/ContentPackage/PacketContentPackageSyncDataScNotify.cs @@ -2,7 +2,7 @@ using EggLink.DanhengServer.Kcp; using EggLink.DanhengServer.Proto; -namespace EggLink.DanhengServer.GameServer.Server.Packet.Send.Scene; +namespace EggLink.DanhengServer.GameServer.Server.Packet.Send.ContentPackage; public class PacketContentPackageSyncDataScNotify : BasePacket { diff --git a/GameServer/Server/Packet/Send/Avatar/PacketGetAssistHistoryScRsp.cs b/GameServer/Server/Packet/Send/Friend/PacketGetAssistHistoryScRsp.cs similarity index 83% rename from GameServer/Server/Packet/Send/Avatar/PacketGetAssistHistoryScRsp.cs rename to GameServer/Server/Packet/Send/Friend/PacketGetAssistHistoryScRsp.cs index a7be31e4..c8f0bdce 100644 --- a/GameServer/Server/Packet/Send/Avatar/PacketGetAssistHistoryScRsp.cs +++ b/GameServer/Server/Packet/Send/Friend/PacketGetAssistHistoryScRsp.cs @@ -2,7 +2,7 @@ using EggLink.DanhengServer.Kcp; using EggLink.DanhengServer.Proto; -namespace EggLink.DanhengServer.GameServer.Server.Packet.Send.Avatar; +namespace EggLink.DanhengServer.GameServer.Server.Packet.Send.Friend; public class PacketGetAssistHistoryScRsp : BasePacket { diff --git a/GameServer/Server/Packet/Send/Avatar/PacketGetAssistListScRsp.cs b/GameServer/Server/Packet/Send/Friend/PacketGetAssistListScRsp.cs similarity index 80% rename from GameServer/Server/Packet/Send/Avatar/PacketGetAssistListScRsp.cs rename to GameServer/Server/Packet/Send/Friend/PacketGetAssistListScRsp.cs index e9343e16..52e741ba 100644 --- a/GameServer/Server/Packet/Send/Avatar/PacketGetAssistListScRsp.cs +++ b/GameServer/Server/Packet/Send/Friend/PacketGetAssistListScRsp.cs @@ -1,7 +1,7 @@ using EggLink.DanhengServer.Kcp; using EggLink.DanhengServer.Proto; -namespace EggLink.DanhengServer.GameServer.Server.Packet.Send.Avatar; +namespace EggLink.DanhengServer.GameServer.Server.Packet.Send.Friend; public class PacketGetAssistListScRsp : BasePacket { diff --git a/GameServer/Server/Packet/Send/Shop/PacketComposeItemScRsp.cs b/GameServer/Server/Packet/Send/Item/PacketComposeItemScRsp.cs similarity index 91% rename from GameServer/Server/Packet/Send/Shop/PacketComposeItemScRsp.cs rename to GameServer/Server/Packet/Send/Item/PacketComposeItemScRsp.cs index 81fcdadf..1e251026 100644 --- a/GameServer/Server/Packet/Send/Shop/PacketComposeItemScRsp.cs +++ b/GameServer/Server/Packet/Send/Item/PacketComposeItemScRsp.cs @@ -2,7 +2,7 @@ using EggLink.DanhengServer.Kcp; using EggLink.DanhengServer.Proto; -namespace EggLink.DanhengServer.GameServer.Server.Packet.Send.Shop; +namespace EggLink.DanhengServer.GameServer.Server.Packet.Send.Item; public class PacketComposeItemScRsp : BasePacket { diff --git a/GameServer/Server/Packet/Send/Avatar/PacketExpUpEquipmentScRsp.cs b/GameServer/Server/Packet/Send/Item/PacketExpUpEquipmentScRsp.cs similarity index 86% rename from GameServer/Server/Packet/Send/Avatar/PacketExpUpEquipmentScRsp.cs rename to GameServer/Server/Packet/Send/Item/PacketExpUpEquipmentScRsp.cs index 86e52633..7d4c9301 100644 --- a/GameServer/Server/Packet/Send/Avatar/PacketExpUpEquipmentScRsp.cs +++ b/GameServer/Server/Packet/Send/Item/PacketExpUpEquipmentScRsp.cs @@ -2,7 +2,7 @@ using EggLink.DanhengServer.Kcp; using EggLink.DanhengServer.Proto; -namespace EggLink.DanhengServer.GameServer.Server.Packet.Send.Avatar; +namespace EggLink.DanhengServer.GameServer.Server.Packet.Send.Item; public class PacketExpUpEquipmentScRsp : BasePacket { diff --git a/GameServer/Server/Packet/Send/Avatar/PacketExpUpRelicScRsp.cs b/GameServer/Server/Packet/Send/Item/PacketExpUpRelicScRsp.cs similarity index 85% rename from GameServer/Server/Packet/Send/Avatar/PacketExpUpRelicScRsp.cs rename to GameServer/Server/Packet/Send/Item/PacketExpUpRelicScRsp.cs index ba965462..5ff5f0f1 100644 --- a/GameServer/Server/Packet/Send/Avatar/PacketExpUpRelicScRsp.cs +++ b/GameServer/Server/Packet/Send/Item/PacketExpUpRelicScRsp.cs @@ -2,7 +2,7 @@ using EggLink.DanhengServer.Kcp; using EggLink.DanhengServer.Proto; -namespace EggLink.DanhengServer.GameServer.Server.Packet.Send.Avatar; +namespace EggLink.DanhengServer.GameServer.Server.Packet.Send.Item; public class PacketExpUpRelicScRsp : BasePacket { diff --git a/GameServer/Server/Packet/Send/Player/PacketGetBagScRsp.cs b/GameServer/Server/Packet/Send/Item/PacketGetBagScRsp.cs similarity index 91% rename from GameServer/Server/Packet/Send/Player/PacketGetBagScRsp.cs rename to GameServer/Server/Packet/Send/Item/PacketGetBagScRsp.cs index 038e9756..0ecb001a 100644 --- a/GameServer/Server/Packet/Send/Player/PacketGetBagScRsp.cs +++ b/GameServer/Server/Packet/Send/Item/PacketGetBagScRsp.cs @@ -2,7 +2,7 @@ using EggLink.DanhengServer.Kcp; using EggLink.DanhengServer.Proto; -namespace EggLink.DanhengServer.GameServer.Server.Packet.Send.Player; +namespace EggLink.DanhengServer.GameServer.Server.Packet.Send.Item; public class PacketGetBagScRsp : BasePacket { diff --git a/GameServer/Server/Packet/Send/Shop/PacketSellItemScRsp.cs b/GameServer/Server/Packet/Send/Item/PacketSellItemScRsp.cs similarity index 87% rename from GameServer/Server/Packet/Send/Shop/PacketSellItemScRsp.cs rename to GameServer/Server/Packet/Send/Item/PacketSellItemScRsp.cs index d3631299..069424c0 100644 --- a/GameServer/Server/Packet/Send/Shop/PacketSellItemScRsp.cs +++ b/GameServer/Server/Packet/Send/Item/PacketSellItemScRsp.cs @@ -2,7 +2,7 @@ using EggLink.DanhengServer.Kcp; using EggLink.DanhengServer.Proto; -namespace EggLink.DanhengServer.GameServer.Server.Packet.Send.Shop; +namespace EggLink.DanhengServer.GameServer.Server.Packet.Send.Item; public class PacketSellItemScRsp : BasePacket { diff --git a/GameServer/Server/Packet/Send/Item/PacketUseItemScRsp.cs b/GameServer/Server/Packet/Send/Item/PacketUseItemScRsp.cs new file mode 100644 index 00000000..c23fc180 --- /dev/null +++ b/GameServer/Server/Packet/Send/Item/PacketUseItemScRsp.cs @@ -0,0 +1,29 @@ +using EggLink.DanhengServer.Database.Inventory; +using EggLink.DanhengServer.Kcp; +using EggLink.DanhengServer.Proto; + +namespace EggLink.DanhengServer.GameServer.Server.Packet.Send.Item; + +public class PacketUseItemScRsp : BasePacket +{ + public PacketUseItemScRsp(Retcode retCode, uint itemId, uint count, List? returnItems) : base(CmdIds.UseItemScRsp) + { + var proto = new UseItemScRsp + { + Retcode = (uint)retCode, + UseItemId = itemId, + UseItemCount = count + }; + + if (returnItems != null) + { + proto.ReturnData = new ItemList(); + foreach (var item in returnItems) + { + proto.ReturnData.ItemList_.Add(item.ToProto()); + } + } + + SetData(proto); + } +} \ No newline at end of file diff --git a/GameServer/Server/Packet/Send/Player/PacketGetJukeboxDataScRsp.cs b/GameServer/Server/Packet/Send/JukeBox/PacketGetJukeboxDataScRsp.cs similarity index 91% rename from GameServer/Server/Packet/Send/Player/PacketGetJukeboxDataScRsp.cs rename to GameServer/Server/Packet/Send/JukeBox/PacketGetJukeboxDataScRsp.cs index ba277046..9c882188 100644 --- a/GameServer/Server/Packet/Send/Player/PacketGetJukeboxDataScRsp.cs +++ b/GameServer/Server/Packet/Send/JukeBox/PacketGetJukeboxDataScRsp.cs @@ -3,7 +3,7 @@ using EggLink.DanhengServer.GameServer.Game.Player; using EggLink.DanhengServer.Kcp; using EggLink.DanhengServer.Proto; -namespace EggLink.DanhengServer.GameServer.Server.Packet.Send.Player; +namespace EggLink.DanhengServer.GameServer.Server.Packet.Send.JukeBox; public class PacketGetJukeboxDataScRsp : BasePacket { diff --git a/GameServer/Server/Packet/Send/Player/PacketPlayBackGroundMusicScRsp.cs b/GameServer/Server/Packet/Send/JukeBox/PacketPlayBackGroundMusicScRsp.cs similarity index 85% rename from GameServer/Server/Packet/Send/Player/PacketPlayBackGroundMusicScRsp.cs rename to GameServer/Server/Packet/Send/JukeBox/PacketPlayBackGroundMusicScRsp.cs index 6ef36095..f2d7ee54 100644 --- a/GameServer/Server/Packet/Send/Player/PacketPlayBackGroundMusicScRsp.cs +++ b/GameServer/Server/Packet/Send/JukeBox/PacketPlayBackGroundMusicScRsp.cs @@ -1,7 +1,7 @@ using EggLink.DanhengServer.Kcp; using EggLink.DanhengServer.Proto; -namespace EggLink.DanhengServer.GameServer.Server.Packet.Send.Player; +namespace EggLink.DanhengServer.GameServer.Server.Packet.Send.JukeBox; public class PacketPlayBackGroundMusicScRsp : BasePacket { diff --git a/GameServer/Server/Packet/Send/Player/PacketDeployRotaterScRsp.cs b/GameServer/Server/Packet/Send/MapRotation/PacketDeployRotaterScRsp.cs similarity index 87% rename from GameServer/Server/Packet/Send/Player/PacketDeployRotaterScRsp.cs rename to GameServer/Server/Packet/Send/MapRotation/PacketDeployRotaterScRsp.cs index 3b2d4428..331e1153 100644 --- a/GameServer/Server/Packet/Send/Player/PacketDeployRotaterScRsp.cs +++ b/GameServer/Server/Packet/Send/MapRotation/PacketDeployRotaterScRsp.cs @@ -1,7 +1,7 @@ using EggLink.DanhengServer.Kcp; using EggLink.DanhengServer.Proto; -namespace EggLink.DanhengServer.GameServer.Server.Packet.Send.Player; +namespace EggLink.DanhengServer.GameServer.Server.Packet.Send.MapRotation; public class PacketDeployRotaterScRsp : BasePacket { diff --git a/GameServer/Server/Packet/Send/Scene/PacketEnterMapRotationRegionScRsp.cs b/GameServer/Server/Packet/Send/MapRotation/PacketEnterMapRotationRegionScRsp.cs similarity index 87% rename from GameServer/Server/Packet/Send/Scene/PacketEnterMapRotationRegionScRsp.cs rename to GameServer/Server/Packet/Send/MapRotation/PacketEnterMapRotationRegionScRsp.cs index 0248cfa1..96484711 100644 --- a/GameServer/Server/Packet/Send/Scene/PacketEnterMapRotationRegionScRsp.cs +++ b/GameServer/Server/Packet/Send/MapRotation/PacketEnterMapRotationRegionScRsp.cs @@ -1,7 +1,7 @@ using EggLink.DanhengServer.Kcp; using EggLink.DanhengServer.Proto; -namespace EggLink.DanhengServer.GameServer.Server.Packet.Send.Scene; +namespace EggLink.DanhengServer.GameServer.Server.Packet.Send.MapRotation; public class PacketEnterMapRotationRegionScRsp : BasePacket { diff --git a/GameServer/Server/Packet/Send/Player/PacketInteractChargerScRsp.cs b/GameServer/Server/Packet/Send/MapRotation/PacketInteractChargerScRsp.cs similarity index 83% rename from GameServer/Server/Packet/Send/Player/PacketInteractChargerScRsp.cs rename to GameServer/Server/Packet/Send/MapRotation/PacketInteractChargerScRsp.cs index 45bc10cd..fd0ed376 100644 --- a/GameServer/Server/Packet/Send/Player/PacketInteractChargerScRsp.cs +++ b/GameServer/Server/Packet/Send/MapRotation/PacketInteractChargerScRsp.cs @@ -1,7 +1,7 @@ using EggLink.DanhengServer.Kcp; using EggLink.DanhengServer.Proto; -namespace EggLink.DanhengServer.GameServer.Server.Packet.Send.Player; +namespace EggLink.DanhengServer.GameServer.Server.Packet.Send.MapRotation; public class PacketInteractChargerScRsp : BasePacket { diff --git a/GameServer/Server/Packet/Send/Player/PacketRemoveRotaterScRsp.cs b/GameServer/Server/Packet/Send/MapRotation/PacketRemoveRotaterScRsp.cs similarity index 88% rename from GameServer/Server/Packet/Send/Player/PacketRemoveRotaterScRsp.cs rename to GameServer/Server/Packet/Send/MapRotation/PacketRemoveRotaterScRsp.cs index 6d116364..fee722b0 100644 --- a/GameServer/Server/Packet/Send/Player/PacketRemoveRotaterScRsp.cs +++ b/GameServer/Server/Packet/Send/MapRotation/PacketRemoveRotaterScRsp.cs @@ -2,7 +2,7 @@ using EggLink.DanhengServer.Kcp; using EggLink.DanhengServer.Proto; -namespace EggLink.DanhengServer.GameServer.Server.Packet.Send.Player; +namespace EggLink.DanhengServer.GameServer.Server.Packet.Send.MapRotation; public class PacketRemoveRotaterScRsp : BasePacket { diff --git a/GameServer/Server/Packet/Send/Player/PacketUpdateEnergyScNotify.cs b/GameServer/Server/Packet/Send/MapRotation/PacketUpdateEnergyScNotify.cs similarity index 86% rename from GameServer/Server/Packet/Send/Player/PacketUpdateEnergyScNotify.cs rename to GameServer/Server/Packet/Send/MapRotation/PacketUpdateEnergyScNotify.cs index e46d417c..19cc2790 100644 --- a/GameServer/Server/Packet/Send/Player/PacketUpdateEnergyScNotify.cs +++ b/GameServer/Server/Packet/Send/MapRotation/PacketUpdateEnergyScNotify.cs @@ -1,7 +1,7 @@ using EggLink.DanhengServer.Kcp; using EggLink.DanhengServer.Proto; -namespace EggLink.DanhengServer.GameServer.Server.Packet.Send.Player; +namespace EggLink.DanhengServer.GameServer.Server.Packet.Send.MapRotation; public class PacketUpdateEnergyScNotify : BasePacket { diff --git a/GameServer/Server/Packet/Send/Mission/PacketFinishItemIdScRsp.cs b/GameServer/Server/Packet/Send/Message/PacketFinishItemIdScRsp.cs similarity index 82% rename from GameServer/Server/Packet/Send/Mission/PacketFinishItemIdScRsp.cs rename to GameServer/Server/Packet/Send/Message/PacketFinishItemIdScRsp.cs index 3cbb7c31..9584ffa7 100644 --- a/GameServer/Server/Packet/Send/Mission/PacketFinishItemIdScRsp.cs +++ b/GameServer/Server/Packet/Send/Message/PacketFinishItemIdScRsp.cs @@ -1,7 +1,7 @@ using EggLink.DanhengServer.Kcp; using EggLink.DanhengServer.Proto; -namespace EggLink.DanhengServer.GameServer.Server.Packet.Send.Mission; +namespace EggLink.DanhengServer.GameServer.Server.Packet.Send.Message; public class PacketFinishItemIdScRsp : BasePacket { diff --git a/GameServer/Server/Packet/Send/Mission/PacketFinishPerformSectionIdScRsp.cs b/GameServer/Server/Packet/Send/Message/PacketFinishPerformSectionIdScRsp.cs similarity index 84% rename from GameServer/Server/Packet/Send/Mission/PacketFinishPerformSectionIdScRsp.cs rename to GameServer/Server/Packet/Send/Message/PacketFinishPerformSectionIdScRsp.cs index 1f8084c8..a1ec5d9a 100644 --- a/GameServer/Server/Packet/Send/Mission/PacketFinishPerformSectionIdScRsp.cs +++ b/GameServer/Server/Packet/Send/Message/PacketFinishPerformSectionIdScRsp.cs @@ -1,7 +1,7 @@ using EggLink.DanhengServer.Kcp; using EggLink.DanhengServer.Proto; -namespace EggLink.DanhengServer.GameServer.Server.Packet.Send.Mission; +namespace EggLink.DanhengServer.GameServer.Server.Packet.Send.Message; public class PacketFinishPerformSectionIdScRsp : BasePacket { diff --git a/GameServer/Server/Packet/Send/Mission/PacketFinishSectionIdScRsp.cs b/GameServer/Server/Packet/Send/Message/PacketFinishSectionIdScRsp.cs similarity index 83% rename from GameServer/Server/Packet/Send/Mission/PacketFinishSectionIdScRsp.cs rename to GameServer/Server/Packet/Send/Message/PacketFinishSectionIdScRsp.cs index fc8625d0..a197cc06 100644 --- a/GameServer/Server/Packet/Send/Mission/PacketFinishSectionIdScRsp.cs +++ b/GameServer/Server/Packet/Send/Message/PacketFinishSectionIdScRsp.cs @@ -1,7 +1,7 @@ using EggLink.DanhengServer.Kcp; using EggLink.DanhengServer.Proto; -namespace EggLink.DanhengServer.GameServer.Server.Packet.Send.Mission; +namespace EggLink.DanhengServer.GameServer.Server.Packet.Send.Message; public class PacketFinishSectionIdScRsp : BasePacket { diff --git a/GameServer/Server/Packet/Send/Mission/PacketGetNpcMessageGroupScRsp.cs b/GameServer/Server/Packet/Send/Message/PacketGetNpcMessageGroupScRsp.cs similarity index 89% rename from GameServer/Server/Packet/Send/Mission/PacketGetNpcMessageGroupScRsp.cs rename to GameServer/Server/Packet/Send/Message/PacketGetNpcMessageGroupScRsp.cs index bc473e1f..bf92075c 100644 --- a/GameServer/Server/Packet/Send/Mission/PacketGetNpcMessageGroupScRsp.cs +++ b/GameServer/Server/Packet/Send/Message/PacketGetNpcMessageGroupScRsp.cs @@ -2,7 +2,7 @@ using EggLink.DanhengServer.Kcp; using EggLink.DanhengServer.Proto; -namespace EggLink.DanhengServer.GameServer.Server.Packet.Send.Mission; +namespace EggLink.DanhengServer.GameServer.Server.Packet.Send.Message; public class PacketGetNpcMessageGroupScRsp : BasePacket { diff --git a/GameServer/Server/Packet/Send/Mission/PacketGetNpcStatusScRsp.cs b/GameServer/Server/Packet/Send/Message/PacketGetNpcStatusScRsp.cs similarity index 90% rename from GameServer/Server/Packet/Send/Mission/PacketGetNpcStatusScRsp.cs rename to GameServer/Server/Packet/Send/Message/PacketGetNpcStatusScRsp.cs index e7e4d951..55cb7314 100644 --- a/GameServer/Server/Packet/Send/Mission/PacketGetNpcStatusScRsp.cs +++ b/GameServer/Server/Packet/Send/Message/PacketGetNpcStatusScRsp.cs @@ -3,7 +3,7 @@ using EggLink.DanhengServer.GameServer.Game.Player; using EggLink.DanhengServer.Kcp; using EggLink.DanhengServer.Proto; -namespace EggLink.DanhengServer.GameServer.Server.Packet.Send.Mission; +namespace EggLink.DanhengServer.GameServer.Server.Packet.Send.Message; public class PacketGetNpcStatusScRsp : BasePacket { diff --git a/GameServer/Server/Packet/Send/Mission/PacketMissionRewardScNotify.cs b/GameServer/Server/Packet/Send/Mission/PacketMissionRewardScNotify.cs index 1a7ca7cc..7ac3b32e 100644 --- a/GameServer/Server/Packet/Send/Mission/PacketMissionRewardScNotify.cs +++ b/GameServer/Server/Packet/Send/Mission/PacketMissionRewardScNotify.cs @@ -16,10 +16,7 @@ public class PacketMissionRewardScNotify : BasePacket Reward = new ItemList() }; - foreach (var i in item) - { - proto.Reward.ItemList_.Add(i.ToProto()); - } + foreach (var i in item) proto.Reward.ItemList_.Add(i.ToProto()); SetData(proto); } diff --git a/GameServer/Server/Packet/Send/Mission/PacketSubMissionRewardScNotify.cs b/GameServer/Server/Packet/Send/Mission/PacketSubMissionRewardScNotify.cs index b7a752c5..23875e24 100644 --- a/GameServer/Server/Packet/Send/Mission/PacketSubMissionRewardScNotify.cs +++ b/GameServer/Server/Packet/Send/Mission/PacketSubMissionRewardScNotify.cs @@ -15,11 +15,8 @@ public class PacketSubMissionRewardScNotify : BasePacket Reward = new ItemList() }; - foreach (var i in item) - { - proto.Reward.ItemList_.Add(i.ToProto()); - } + foreach (var i in item) proto.Reward.ItemList_.Add(i.ToProto()); SetData(proto); } -} +} \ No newline at end of file diff --git a/GameServer/Server/Packet/Send/Player/PacketGetPhoneDataScRsp.cs b/GameServer/Server/Packet/Send/Phone/PacketGetPhoneDataScRsp.cs similarity index 92% rename from GameServer/Server/Packet/Send/Player/PacketGetPhoneDataScRsp.cs rename to GameServer/Server/Packet/Send/Phone/PacketGetPhoneDataScRsp.cs index 4b1b8b58..d048b616 100644 --- a/GameServer/Server/Packet/Send/Player/PacketGetPhoneDataScRsp.cs +++ b/GameServer/Server/Packet/Send/Phone/PacketGetPhoneDataScRsp.cs @@ -3,7 +3,7 @@ using EggLink.DanhengServer.GameServer.Game.Player; using EggLink.DanhengServer.Kcp; using EggLink.DanhengServer.Proto; -namespace EggLink.DanhengServer.GameServer.Server.Packet.Send.Player; +namespace EggLink.DanhengServer.GameServer.Server.Packet.Send.Phone; public class PacketGetPhoneDataScRsp : BasePacket { diff --git a/GameServer/Server/Packet/Send/Player/PacketSelectChatBubbleScRsp.cs b/GameServer/Server/Packet/Send/Phone/PacketSelectChatBubbleScRsp.cs similarity index 83% rename from GameServer/Server/Packet/Send/Player/PacketSelectChatBubbleScRsp.cs rename to GameServer/Server/Packet/Send/Phone/PacketSelectChatBubbleScRsp.cs index e4aa9ede..96158086 100644 --- a/GameServer/Server/Packet/Send/Player/PacketSelectChatBubbleScRsp.cs +++ b/GameServer/Server/Packet/Send/Phone/PacketSelectChatBubbleScRsp.cs @@ -1,7 +1,7 @@ using EggLink.DanhengServer.Kcp; using EggLink.DanhengServer.Proto; -namespace EggLink.DanhengServer.GameServer.Server.Packet.Send.Player; +namespace EggLink.DanhengServer.GameServer.Server.Packet.Send.Phone; public class PacketSelectChatBubbleScRsp : BasePacket { diff --git a/GameServer/Server/Packet/Send/Player/PacketSelectPhoneThemeScRsp.cs b/GameServer/Server/Packet/Send/Phone/PacketSelectPhoneThemeScRsp.cs similarity index 83% rename from GameServer/Server/Packet/Send/Player/PacketSelectPhoneThemeScRsp.cs rename to GameServer/Server/Packet/Send/Phone/PacketSelectPhoneThemeScRsp.cs index fc2194ab..c7d87478 100644 --- a/GameServer/Server/Packet/Send/Player/PacketSelectPhoneThemeScRsp.cs +++ b/GameServer/Server/Packet/Send/Phone/PacketSelectPhoneThemeScRsp.cs @@ -1,7 +1,7 @@ using EggLink.DanhengServer.Kcp; using EggLink.DanhengServer.Proto; -namespace EggLink.DanhengServer.GameServer.Server.Packet.Send.Player; +namespace EggLink.DanhengServer.GameServer.Server.Packet.Send.Phone; public class PacketSelectPhoneThemeScRsp : BasePacket { diff --git a/GameServer/Server/Packet/Send/Avatar/PacketAvatarPathChangedNotify.cs b/GameServer/Server/Packet/Send/Player/PacketAvatarPathChangedNotify.cs similarity index 86% rename from GameServer/Server/Packet/Send/Avatar/PacketAvatarPathChangedNotify.cs rename to GameServer/Server/Packet/Send/Player/PacketAvatarPathChangedNotify.cs index 7db24ba9..5a1b974b 100644 --- a/GameServer/Server/Packet/Send/Avatar/PacketAvatarPathChangedNotify.cs +++ b/GameServer/Server/Packet/Send/Player/PacketAvatarPathChangedNotify.cs @@ -1,7 +1,7 @@ using EggLink.DanhengServer.Kcp; using EggLink.DanhengServer.Proto; -namespace EggLink.DanhengServer.GameServer.Server.Packet.Send.Avatar; +namespace EggLink.DanhengServer.GameServer.Server.Packet.Send.Player; public class PacketAvatarPathChangedNotify : BasePacket { diff --git a/GameServer/Server/Packet/Send/Player/PacketGetLevelRewardScRsp.cs b/GameServer/Server/Packet/Send/Player/PacketGetLevelRewardScRsp.cs index 5075aff4..ba2574a9 100644 --- a/GameServer/Server/Packet/Send/Player/PacketGetLevelRewardScRsp.cs +++ b/GameServer/Server/Packet/Send/Player/PacketGetLevelRewardScRsp.cs @@ -1,9 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using EggLink.DanhengServer.Database.Inventory; +using EggLink.DanhengServer.Database.Inventory; using EggLink.DanhengServer.Kcp; using EggLink.DanhengServer.Proto; @@ -19,10 +14,7 @@ public class PacketGetLevelRewardScRsp : BasePacket Reward = new ItemList() }; - foreach (var item in reward) - { - proto.Reward.ItemList_.Add(item.ToProto()); - } + foreach (var item in reward) proto.Reward.ItemList_.Add(item.ToProto()); SetData(proto); } @@ -36,4 +28,4 @@ public class PacketGetLevelRewardScRsp : BasePacket SetData(proto); } -} +} \ No newline at end of file diff --git a/GameServer/Server/Packet/Send/Player/PacketGetLevelRewardTakenListScRsp.cs b/GameServer/Server/Packet/Send/Player/PacketGetLevelRewardTakenListScRsp.cs index 33bcc9e5..ae0dfa89 100644 --- a/GameServer/Server/Packet/Send/Player/PacketGetLevelRewardTakenListScRsp.cs +++ b/GameServer/Server/Packet/Send/Player/PacketGetLevelRewardTakenListScRsp.cs @@ -15,4 +15,4 @@ public class PacketGetLevelRewardTakenListScRsp : BasePacket SetData(proto); } -} +} \ No newline at end of file diff --git a/GameServer/Server/Packet/Send/Avatar/PacketGetMultiPathAvatarInfoScRsp.cs b/GameServer/Server/Packet/Send/Player/PacketGetMultiPathAvatarInfoScRsp.cs similarity index 90% rename from GameServer/Server/Packet/Send/Avatar/PacketGetMultiPathAvatarInfoScRsp.cs rename to GameServer/Server/Packet/Send/Player/PacketGetMultiPathAvatarInfoScRsp.cs index 2bb6f5bf..f597d642 100644 --- a/GameServer/Server/Packet/Send/Avatar/PacketGetMultiPathAvatarInfoScRsp.cs +++ b/GameServer/Server/Packet/Send/Player/PacketGetMultiPathAvatarInfoScRsp.cs @@ -3,7 +3,7 @@ using EggLink.DanhengServer.GameServer.Game.Player; using EggLink.DanhengServer.Kcp; using EggLink.DanhengServer.Proto; -namespace EggLink.DanhengServer.GameServer.Server.Packet.Send.Avatar; +namespace EggLink.DanhengServer.GameServer.Server.Packet.Send.Player; public class PacketGetMultiPathAvatarInfoScRsp : BasePacket { @@ -17,7 +17,7 @@ public class PacketGetMultiPathAvatarInfoScRsp : BasePacket var avatar = player.AvatarManager!.GetAvatar(multiPathAvatar.BaseAvatarID); if (avatar != null) { - if (avatar.AvatarId == 8001) // only add main character + if (avatar.AvatarId == 8001) // only add main character proto.BasicTypeIdList.Add((uint)avatar.PathId); var pathId = avatar.PathId > 0 ? avatar.PathId : avatar.AvatarId; if (pathId == 8001) diff --git a/GameServer/Server/Packet/Send/Others/PacketGetSecretKeyInfoScRsp.cs b/GameServer/Server/Packet/Send/Player/PacketGetSecretKeyInfoScRsp.cs similarity index 86% rename from GameServer/Server/Packet/Send/Others/PacketGetSecretKeyInfoScRsp.cs rename to GameServer/Server/Packet/Send/Player/PacketGetSecretKeyInfoScRsp.cs index 57b8bca4..2089b83e 100644 --- a/GameServer/Server/Packet/Send/Others/PacketGetSecretKeyInfoScRsp.cs +++ b/GameServer/Server/Packet/Send/Player/PacketGetSecretKeyInfoScRsp.cs @@ -1,7 +1,7 @@ using EggLink.DanhengServer.Kcp; using EggLink.DanhengServer.Proto; -namespace EggLink.DanhengServer.GameServer.Server.Packet.Send.Others; +namespace EggLink.DanhengServer.GameServer.Server.Packet.Send.Player; public class PacketGetSecretKeyInfoScRsp : BasePacket { diff --git a/GameServer/Server/Packet/Send/Others/PacketGetVideoVersionKeyScRsp.cs b/GameServer/Server/Packet/Send/Player/PacketGetVideoVersionKeyScRsp.cs similarity index 97% rename from GameServer/Server/Packet/Send/Others/PacketGetVideoVersionKeyScRsp.cs rename to GameServer/Server/Packet/Send/Player/PacketGetVideoVersionKeyScRsp.cs index df030063..4597d67a 100644 --- a/GameServer/Server/Packet/Send/Others/PacketGetVideoVersionKeyScRsp.cs +++ b/GameServer/Server/Packet/Send/Player/PacketGetVideoVersionKeyScRsp.cs @@ -1,6 +1,6 @@ using EggLink.DanhengServer.Kcp; -namespace EggLink.DanhengServer.GameServer.Server.Packet.Send.Others; +namespace EggLink.DanhengServer.GameServer.Server.Packet.Send.Player; public class PacketGetVideoVersionKeyScRsp : BasePacket { diff --git a/GameServer/Server/Packet/Send/Others/PacketRetcodeNotify.cs b/GameServer/Server/Packet/Send/Player/PacketRetcodeNotify.cs similarity index 84% rename from GameServer/Server/Packet/Send/Others/PacketRetcodeNotify.cs rename to GameServer/Server/Packet/Send/Player/PacketRetcodeNotify.cs index 34f1db3b..d00eac92 100644 --- a/GameServer/Server/Packet/Send/Others/PacketRetcodeNotify.cs +++ b/GameServer/Server/Packet/Send/Player/PacketRetcodeNotify.cs @@ -1,7 +1,7 @@ using EggLink.DanhengServer.Kcp; using EggLink.DanhengServer.Proto; -namespace EggLink.DanhengServer.GameServer.Server.Packet.Send.Others; +namespace EggLink.DanhengServer.GameServer.Server.Packet.Send.Player; public class PacketRetcodeNotify : BasePacket { diff --git a/GameServer/Server/Packet/Send/Others/PacketServerAnnounceNotify.cs b/GameServer/Server/Packet/Send/Player/PacketServerAnnounceNotify.cs similarity index 90% rename from GameServer/Server/Packet/Send/Others/PacketServerAnnounceNotify.cs rename to GameServer/Server/Packet/Send/Player/PacketServerAnnounceNotify.cs index 9a485fcd..f39c269b 100644 --- a/GameServer/Server/Packet/Send/Others/PacketServerAnnounceNotify.cs +++ b/GameServer/Server/Packet/Send/Player/PacketServerAnnounceNotify.cs @@ -2,7 +2,7 @@ using EggLink.DanhengServer.Proto; using EggLink.DanhengServer.Util; -namespace EggLink.DanhengServer.GameServer.Server.Packet.Send.Others; +namespace EggLink.DanhengServer.GameServer.Server.Packet.Send.Player; public class PacketServerAnnounceNotify : BasePacket { diff --git a/GameServer/Server/Packet/Send/Avatar/PacketSetAvatarPathScRsp.cs b/GameServer/Server/Packet/Send/Player/PacketSetAvatarPathScRsp.cs similarity index 83% rename from GameServer/Server/Packet/Send/Avatar/PacketSetAvatarPathScRsp.cs rename to GameServer/Server/Packet/Send/Player/PacketSetAvatarPathScRsp.cs index b463ea8f..e7b5c4d5 100644 --- a/GameServer/Server/Packet/Send/Avatar/PacketSetAvatarPathScRsp.cs +++ b/GameServer/Server/Packet/Send/Player/PacketSetAvatarPathScRsp.cs @@ -1,7 +1,7 @@ using EggLink.DanhengServer.Kcp; using EggLink.DanhengServer.Proto; -namespace EggLink.DanhengServer.GameServer.Server.Packet.Send.Avatar; +namespace EggLink.DanhengServer.GameServer.Server.Packet.Send.Player; public class PacketSetAvatarPathScRsp : BasePacket { diff --git a/GameServer/Server/Packet/Send/Player/PacketGetPlayerBoardDataScRsp.cs b/GameServer/Server/Packet/Send/PlayerBoard/PacketGetPlayerBoardDataScRsp.cs similarity index 99% rename from GameServer/Server/Packet/Send/Player/PacketGetPlayerBoardDataScRsp.cs rename to GameServer/Server/Packet/Send/PlayerBoard/PacketGetPlayerBoardDataScRsp.cs index 655f3b46..90dca19b 100644 --- a/GameServer/Server/Packet/Send/Player/PacketGetPlayerBoardDataScRsp.cs +++ b/GameServer/Server/Packet/Send/PlayerBoard/PacketGetPlayerBoardDataScRsp.cs @@ -2,7 +2,7 @@ using EggLink.DanhengServer.Kcp; using EggLink.DanhengServer.Proto; -namespace EggLink.DanhengServer.GameServer.Server.Packet.Send.Player; +namespace EggLink.DanhengServer.GameServer.Server.Packet.Send.PlayerBoard; public class PacketGetPlayerBoardDataScRsp : BasePacket { diff --git a/GameServer/Server/Packet/Send/Avatar/PacketSetAssistAvatarScRsp.cs b/GameServer/Server/Packet/Send/PlayerBoard/PacketSetAssistAvatarScRsp.cs similarity index 84% rename from GameServer/Server/Packet/Send/Avatar/PacketSetAssistAvatarScRsp.cs rename to GameServer/Server/Packet/Send/PlayerBoard/PacketSetAssistAvatarScRsp.cs index 697afbd4..4aebe4b3 100644 --- a/GameServer/Server/Packet/Send/Avatar/PacketSetAssistAvatarScRsp.cs +++ b/GameServer/Server/Packet/Send/PlayerBoard/PacketSetAssistAvatarScRsp.cs @@ -2,7 +2,7 @@ using EggLink.DanhengServer.Proto; using Google.Protobuf.Collections; -namespace EggLink.DanhengServer.GameServer.Server.Packet.Send.Avatar; +namespace EggLink.DanhengServer.GameServer.Server.Packet.Send.PlayerBoard; public class PacketSetAssistAvatarScRsp : BasePacket { diff --git a/GameServer/Server/Packet/Send/Avatar/PacketSetDisplayAvatarScRsp.cs b/GameServer/Server/Packet/Send/PlayerBoard/PacketSetDisplayAvatarScRsp.cs similarity index 84% rename from GameServer/Server/Packet/Send/Avatar/PacketSetDisplayAvatarScRsp.cs rename to GameServer/Server/Packet/Send/PlayerBoard/PacketSetDisplayAvatarScRsp.cs index 479f1cbc..3607cc11 100644 --- a/GameServer/Server/Packet/Send/Avatar/PacketSetDisplayAvatarScRsp.cs +++ b/GameServer/Server/Packet/Send/PlayerBoard/PacketSetDisplayAvatarScRsp.cs @@ -2,7 +2,7 @@ using EggLink.DanhengServer.Proto; using Google.Protobuf.Collections; -namespace EggLink.DanhengServer.GameServer.Server.Packet.Send.Avatar; +namespace EggLink.DanhengServer.GameServer.Server.Packet.Send.PlayerBoard; public class PacketSetDisplayAvatarScRsp : BasePacket { diff --git a/GameServer/Server/Packet/Send/Player/PacketSetHeadIconScRsp.cs b/GameServer/Server/Packet/Send/PlayerBoard/PacketSetHeadIconScRsp.cs similarity index 97% rename from GameServer/Server/Packet/Send/Player/PacketSetHeadIconScRsp.cs rename to GameServer/Server/Packet/Send/PlayerBoard/PacketSetHeadIconScRsp.cs index 5a551b10..3a7da763 100644 --- a/GameServer/Server/Packet/Send/Player/PacketSetHeadIconScRsp.cs +++ b/GameServer/Server/Packet/Send/PlayerBoard/PacketSetHeadIconScRsp.cs @@ -2,7 +2,7 @@ using EggLink.DanhengServer.Kcp; using EggLink.DanhengServer.Proto; -namespace EggLink.DanhengServer.GameServer.Server.Packet.Send.Player; +namespace EggLink.DanhengServer.GameServer.Server.Packet.Send.PlayerBoard; public class PacketSetHeadIconScRsp : BasePacket { diff --git a/GameServer/Server/Packet/Send/Player/PacketSetSignatureScRsp.cs b/GameServer/Server/Packet/Send/PlayerBoard/PacketSetSignatureScRsp.cs similarity index 97% rename from GameServer/Server/Packet/Send/Player/PacketSetSignatureScRsp.cs rename to GameServer/Server/Packet/Send/PlayerBoard/PacketSetSignatureScRsp.cs index efe88c7c..5b246a26 100644 --- a/GameServer/Server/Packet/Send/Player/PacketSetSignatureScRsp.cs +++ b/GameServer/Server/Packet/Send/PlayerBoard/PacketSetSignatureScRsp.cs @@ -1,7 +1,7 @@ using EggLink.DanhengServer.Kcp; using EggLink.DanhengServer.Proto; -namespace EggLink.DanhengServer.GameServer.Server.Packet.Send.Player; +namespace EggLink.DanhengServer.GameServer.Server.Packet.Send.PlayerBoard; public class PacketSetSignatureScRsp : BasePacket { diff --git a/GameServer/Server/Packet/Send/Player/PacketPlayerSyncScNotify.cs b/GameServer/Server/Packet/Send/PlayerSync/PacketPlayerSyncScNotify.cs similarity index 99% rename from GameServer/Server/Packet/Send/Player/PacketPlayerSyncScNotify.cs rename to GameServer/Server/Packet/Send/PlayerSync/PacketPlayerSyncScNotify.cs index dd294255..048ed7d6 100644 --- a/GameServer/Server/Packet/Send/Player/PacketPlayerSyncScNotify.cs +++ b/GameServer/Server/Packet/Send/PlayerSync/PacketPlayerSyncScNotify.cs @@ -7,7 +7,7 @@ using EggLink.DanhengServer.Enums.Item; using EggLink.DanhengServer.Kcp; using EggLink.DanhengServer.Proto; -namespace EggLink.DanhengServer.GameServer.Server.Packet.Send.Player; +namespace EggLink.DanhengServer.GameServer.Server.Packet.Send.PlayerSync; public class PacketPlayerSyncScNotify : BasePacket { @@ -131,6 +131,7 @@ public class PacketPlayerSyncScNotify : BasePacket SetData(proto); } + public PacketPlayerSyncScNotify(List quest) : base(CmdIds.PlayerSyncScNotify) { var proto = new PlayerSyncScNotify(); diff --git a/GameServer/Server/Packet/Send/Rogue/PacketGetRogueHandbookDataScRsp.cs b/GameServer/Server/Packet/Send/RogueCommon/PacketGetRogueHandbookDataScRsp.cs similarity index 99% rename from GameServer/Server/Packet/Send/Rogue/PacketGetRogueHandbookDataScRsp.cs rename to GameServer/Server/Packet/Send/RogueCommon/PacketGetRogueHandbookDataScRsp.cs index c28642d5..3afccba0 100644 --- a/GameServer/Server/Packet/Send/Rogue/PacketGetRogueHandbookDataScRsp.cs +++ b/GameServer/Server/Packet/Send/RogueCommon/PacketGetRogueHandbookDataScRsp.cs @@ -2,7 +2,7 @@ using EggLink.DanhengServer.Kcp; using EggLink.DanhengServer.Proto; -namespace EggLink.DanhengServer.GameServer.Server.Packet.Send.Rogue; +namespace EggLink.DanhengServer.GameServer.Server.Packet.Send.RogueCommon; public class PacketGetRogueHandbookDataScRsp : BasePacket { diff --git a/GameServer/Server/Packet/Send/Rogue/PacketHandleRogueCommonPendingActionScRsp.cs b/GameServer/Server/Packet/Send/RogueCommon/PacketHandleRogueCommonPendingActionScRsp.cs similarity index 99% rename from GameServer/Server/Packet/Send/Rogue/PacketHandleRogueCommonPendingActionScRsp.cs rename to GameServer/Server/Packet/Send/RogueCommon/PacketHandleRogueCommonPendingActionScRsp.cs index d02ebcae..6b2d95ca 100644 --- a/GameServer/Server/Packet/Send/Rogue/PacketHandleRogueCommonPendingActionScRsp.cs +++ b/GameServer/Server/Packet/Send/RogueCommon/PacketHandleRogueCommonPendingActionScRsp.cs @@ -2,7 +2,7 @@ using EggLink.DanhengServer.Kcp; using EggLink.DanhengServer.Proto; -namespace EggLink.DanhengServer.GameServer.Server.Packet.Send.Rogue; +namespace EggLink.DanhengServer.GameServer.Server.Packet.Send.RogueCommon; public class PacketHandleRogueCommonPendingActionScRsp : BasePacket { diff --git a/GameServer/Server/Packet/Send/Rogue/PacketSelectRogueCommonDialogueOptionScRsp.cs b/GameServer/Server/Packet/Send/RogueCommon/PacketSelectRogueCommonDialogueOptionScRsp.cs similarity index 98% rename from GameServer/Server/Packet/Send/Rogue/PacketSelectRogueCommonDialogueOptionScRsp.cs rename to GameServer/Server/Packet/Send/RogueCommon/PacketSelectRogueCommonDialogueOptionScRsp.cs index fbb90ab4..65b46fe7 100644 --- a/GameServer/Server/Packet/Send/Rogue/PacketSelectRogueCommonDialogueOptionScRsp.cs +++ b/GameServer/Server/Packet/Send/RogueCommon/PacketSelectRogueCommonDialogueOptionScRsp.cs @@ -2,7 +2,7 @@ using EggLink.DanhengServer.Kcp; using EggLink.DanhengServer.Proto; -namespace EggLink.DanhengServer.GameServer.Server.Packet.Send.Rogue; +namespace EggLink.DanhengServer.GameServer.Server.Packet.Send.RogueCommon; public class PacketSelectRogueCommonDialogueOptionScRsp : BasePacket { diff --git a/GameServer/Server/Packet/Send/Rogue/PacketSyncRogueCommonActionResultScNotify.cs b/GameServer/Server/Packet/Send/RogueCommon/PacketSyncRogueCommonActionResultScNotify.cs similarity index 99% rename from GameServer/Server/Packet/Send/Rogue/PacketSyncRogueCommonActionResultScNotify.cs rename to GameServer/Server/Packet/Send/RogueCommon/PacketSyncRogueCommonActionResultScNotify.cs index e98408a1..f7bf2855 100644 --- a/GameServer/Server/Packet/Send/Rogue/PacketSyncRogueCommonActionResultScNotify.cs +++ b/GameServer/Server/Packet/Send/RogueCommon/PacketSyncRogueCommonActionResultScNotify.cs @@ -1,7 +1,7 @@ using EggLink.DanhengServer.Kcp; using EggLink.DanhengServer.Proto; -namespace EggLink.DanhengServer.GameServer.Server.Packet.Send.Rogue; +namespace EggLink.DanhengServer.GameServer.Server.Packet.Send.RogueCommon; public class PacketSyncRogueCommonActionResultScNotify : BasePacket { diff --git a/GameServer/Server/Packet/Send/Rogue/PacketSyncRogueCommonDialogueDataScNotify.cs b/GameServer/Server/Packet/Send/RogueCommon/PacketSyncRogueCommonDialogueDataScNotify.cs similarity index 98% rename from GameServer/Server/Packet/Send/Rogue/PacketSyncRogueCommonDialogueDataScNotify.cs rename to GameServer/Server/Packet/Send/RogueCommon/PacketSyncRogueCommonDialogueDataScNotify.cs index bd6a8155..86538b27 100644 --- a/GameServer/Server/Packet/Send/Rogue/PacketSyncRogueCommonDialogueDataScNotify.cs +++ b/GameServer/Server/Packet/Send/RogueCommon/PacketSyncRogueCommonDialogueDataScNotify.cs @@ -2,7 +2,7 @@ using EggLink.DanhengServer.Kcp; using EggLink.DanhengServer.Proto; -namespace EggLink.DanhengServer.GameServer.Server.Packet.Send.Rogue; +namespace EggLink.DanhengServer.GameServer.Server.Packet.Send.RogueCommon; public class PacketSyncRogueCommonDialogueDataScNotify : BasePacket { diff --git a/GameServer/Server/Packet/Send/Rogue/PacketSyncRogueCommonDialogueOptionFinishScNotify.cs b/GameServer/Server/Packet/Send/RogueCommon/PacketSyncRogueCommonDialogueOptionFinishScNotify.cs similarity index 98% rename from GameServer/Server/Packet/Send/Rogue/PacketSyncRogueCommonDialogueOptionFinishScNotify.cs rename to GameServer/Server/Packet/Send/RogueCommon/PacketSyncRogueCommonDialogueOptionFinishScNotify.cs index d8b0026b..8e9a5f21 100644 --- a/GameServer/Server/Packet/Send/Rogue/PacketSyncRogueCommonDialogueOptionFinishScNotify.cs +++ b/GameServer/Server/Packet/Send/RogueCommon/PacketSyncRogueCommonDialogueOptionFinishScNotify.cs @@ -2,7 +2,7 @@ using EggLink.DanhengServer.Kcp; using EggLink.DanhengServer.Proto; -namespace EggLink.DanhengServer.GameServer.Server.Packet.Send.Rogue; +namespace EggLink.DanhengServer.GameServer.Server.Packet.Send.RogueCommon; public class PacketSyncRogueCommonDialogueOptionFinishScNotify : BasePacket { diff --git a/GameServer/Server/Packet/Send/Rogue/PacketSyncRogueCommonPendingActionScNotify.cs b/GameServer/Server/Packet/Send/RogueCommon/PacketSyncRogueCommonPendingActionScNotify.cs similarity index 98% rename from GameServer/Server/Packet/Send/Rogue/PacketSyncRogueCommonPendingActionScNotify.cs rename to GameServer/Server/Packet/Send/RogueCommon/PacketSyncRogueCommonPendingActionScNotify.cs index 84866aac..06c9f914 100644 --- a/GameServer/Server/Packet/Send/Rogue/PacketSyncRogueCommonPendingActionScNotify.cs +++ b/GameServer/Server/Packet/Send/RogueCommon/PacketSyncRogueCommonPendingActionScNotify.cs @@ -2,7 +2,7 @@ using EggLink.DanhengServer.Kcp; using EggLink.DanhengServer.Proto; -namespace EggLink.DanhengServer.GameServer.Server.Packet.Send.Rogue; +namespace EggLink.DanhengServer.GameServer.Server.Packet.Send.RogueCommon; public class PacketSyncRogueCommonPendingActionScNotify : BasePacket { diff --git a/GameServer/Server/Packet/Send/Rogue/PacketSyncRogueCommonVirtualItemInfoScNotify.cs b/GameServer/Server/Packet/Send/RogueCommon/PacketSyncRogueCommonVirtualItemInfoScNotify.cs similarity index 98% rename from GameServer/Server/Packet/Send/Rogue/PacketSyncRogueCommonVirtualItemInfoScNotify.cs rename to GameServer/Server/Packet/Send/RogueCommon/PacketSyncRogueCommonVirtualItemInfoScNotify.cs index 8de489cb..b110db7d 100644 --- a/GameServer/Server/Packet/Send/Rogue/PacketSyncRogueCommonVirtualItemInfoScNotify.cs +++ b/GameServer/Server/Packet/Send/RogueCommon/PacketSyncRogueCommonVirtualItemInfoScNotify.cs @@ -2,7 +2,7 @@ using EggLink.DanhengServer.Kcp; using EggLink.DanhengServer.Proto; -namespace EggLink.DanhengServer.GameServer.Server.Packet.Send.Rogue; +namespace EggLink.DanhengServer.GameServer.Server.Packet.Send.RogueCommon; public class PacketSyncRogueCommonVirtualItemInfoScNotify : BasePacket { diff --git a/GameServer/Server/Packet/Send/Shop/PacketDoGachaInRollShopScRsp.cs b/GameServer/Server/Packet/Send/RollShop/PacketDoGachaInRollShopScRsp.cs similarity index 87% rename from GameServer/Server/Packet/Send/Shop/PacketDoGachaInRollShopScRsp.cs rename to GameServer/Server/Packet/Send/RollShop/PacketDoGachaInRollShopScRsp.cs index 85bae6d1..6651bea7 100644 --- a/GameServer/Server/Packet/Send/Shop/PacketDoGachaInRollShopScRsp.cs +++ b/GameServer/Server/Packet/Send/RollShop/PacketDoGachaInRollShopScRsp.cs @@ -1,7 +1,7 @@ using EggLink.DanhengServer.Kcp; using EggLink.DanhengServer.Proto; -namespace EggLink.DanhengServer.GameServer.Server.Packet.Send.Shop; +namespace EggLink.DanhengServer.GameServer.Server.Packet.Send.RollShop; public class PacketDoGachaInRollShopScRsp : BasePacket { diff --git a/GameServer/Server/Packet/Send/Shop/PacketGetRollShopInfoScRsp.cs.cs b/GameServer/Server/Packet/Send/RollShop/PacketGetRollShopInfoScRsp.cs.cs similarity index 91% rename from GameServer/Server/Packet/Send/Shop/PacketGetRollShopInfoScRsp.cs.cs rename to GameServer/Server/Packet/Send/RollShop/PacketGetRollShopInfoScRsp.cs.cs index eaa8778b..22b4d243 100644 --- a/GameServer/Server/Packet/Send/Shop/PacketGetRollShopInfoScRsp.cs.cs +++ b/GameServer/Server/Packet/Send/RollShop/PacketGetRollShopInfoScRsp.cs.cs @@ -2,7 +2,7 @@ using EggLink.DanhengServer.Kcp; using EggLink.DanhengServer.Proto; -namespace EggLink.DanhengServer.GameServer.Server.Packet.Send.Shop; +namespace EggLink.DanhengServer.GameServer.Server.Packet.Send.RollShop; public class PacketGetRollShopInfoScRsp : BasePacket { diff --git a/GameServer/Server/Packet/Send/Scene/PacketGetSceneMapInfoScRsp.cs b/GameServer/Server/Packet/Send/Scene/PacketGetSceneMapInfoScRsp.cs index 6216f2fb..f859809e 100644 --- a/GameServer/Server/Packet/Send/Scene/PacketGetSceneMapInfoScRsp.cs +++ b/GameServer/Server/Packet/Send/Scene/PacketGetSceneMapInfoScRsp.cs @@ -1,6 +1,5 @@ using EggLink.DanhengServer.Data; using EggLink.DanhengServer.Enums.Scene; -using EggLink.DanhengServer.GameServer.Game.Mission; using EggLink.DanhengServer.GameServer.Game.Player; using EggLink.DanhengServer.Kcp; using EggLink.DanhengServer.Proto; @@ -23,7 +22,7 @@ public class PacketGetSceneMapInfoScRsp : BasePacket var mazeMap = new SceneMapInfo { EntryId = entry, - EntryStoryLineId = (uint)(player.StoryLineManager?.StoryLineData.CurStoryLineId ?? 0), + EntryStoryLineId = (uint)(player.StoryLineManager?.StoryLineData.CurStoryLineId ?? 0) //DimensionId = (uint)(player.SceneInstance?.EntityLoader is StoryLineEntityLoader loader ? loader.DimensionId // : 0) }; diff --git a/GameServer/Server/Packet/Send/Lineup/PacketSceneCastSkillCostMpScRsp.cs b/GameServer/Server/Packet/Send/Scene/PacketSceneCastSkillCostMpScRsp.cs similarity index 84% rename from GameServer/Server/Packet/Send/Lineup/PacketSceneCastSkillCostMpScRsp.cs rename to GameServer/Server/Packet/Send/Scene/PacketSceneCastSkillCostMpScRsp.cs index 7d5e08de..f0516f9a 100644 --- a/GameServer/Server/Packet/Send/Lineup/PacketSceneCastSkillCostMpScRsp.cs +++ b/GameServer/Server/Packet/Send/Scene/PacketSceneCastSkillCostMpScRsp.cs @@ -1,7 +1,7 @@ using EggLink.DanhengServer.Kcp; using EggLink.DanhengServer.Proto; -namespace EggLink.DanhengServer.GameServer.Server.Packet.Send.Lineup; +namespace EggLink.DanhengServer.GameServer.Server.Packet.Send.Scene; public class PacketSceneCastSkillCostMpScRsp : BasePacket { diff --git a/GameServer/Server/Packet/Send/Lineup/PacketSceneCastSkillMpUpdateScNotify.cs b/GameServer/Server/Packet/Send/Scene/PacketSceneCastSkillMpUpdateScNotify.cs similarity index 86% rename from GameServer/Server/Packet/Send/Lineup/PacketSceneCastSkillMpUpdateScNotify.cs rename to GameServer/Server/Packet/Send/Scene/PacketSceneCastSkillMpUpdateScNotify.cs index cf0e46fd..e43cde4f 100644 --- a/GameServer/Server/Packet/Send/Lineup/PacketSceneCastSkillMpUpdateScNotify.cs +++ b/GameServer/Server/Packet/Send/Scene/PacketSceneCastSkillMpUpdateScNotify.cs @@ -1,7 +1,7 @@ using EggLink.DanhengServer.Kcp; using EggLink.DanhengServer.Proto; -namespace EggLink.DanhengServer.GameServer.Server.Packet.Send.Lineup; +namespace EggLink.DanhengServer.GameServer.Server.Packet.Send.Scene; public class PacketSceneCastSkillMpUpdateScNotify : BasePacket { diff --git a/GameServer/Server/Packet/Send/Battle/PacketSceneCastSkillScRsp.cs b/GameServer/Server/Packet/Send/Scene/PacketSceneCastSkillScRsp.cs similarity index 91% rename from GameServer/Server/Packet/Send/Battle/PacketSceneCastSkillScRsp.cs rename to GameServer/Server/Packet/Send/Scene/PacketSceneCastSkillScRsp.cs index f57ecbdf..2d06e2e0 100644 --- a/GameServer/Server/Packet/Send/Battle/PacketSceneCastSkillScRsp.cs +++ b/GameServer/Server/Packet/Send/Scene/PacketSceneCastSkillScRsp.cs @@ -2,7 +2,7 @@ using EggLink.DanhengServer.Kcp; using EggLink.DanhengServer.Proto; -namespace EggLink.DanhengServer.GameServer.Server.Packet.Send.Battle; +namespace EggLink.DanhengServer.GameServer.Server.Packet.Send.Scene; public class PacketSceneCastSkillScRsp : BasePacket { diff --git a/GameServer/Server/Packet/Send/Battle/PacketSceneEnterStageScRsp.cs b/GameServer/Server/Packet/Send/Scene/PacketSceneEnterStageScRsp.cs similarity index 90% rename from GameServer/Server/Packet/Send/Battle/PacketSceneEnterStageScRsp.cs rename to GameServer/Server/Packet/Send/Scene/PacketSceneEnterStageScRsp.cs index 3d2dcf9f..97008858 100644 --- a/GameServer/Server/Packet/Send/Battle/PacketSceneEnterStageScRsp.cs +++ b/GameServer/Server/Packet/Send/Scene/PacketSceneEnterStageScRsp.cs @@ -2,7 +2,7 @@ using EggLink.DanhengServer.Kcp; using EggLink.DanhengServer.Proto; -namespace EggLink.DanhengServer.GameServer.Server.Packet.Send.Battle; +namespace EggLink.DanhengServer.GameServer.Server.Packet.Send.Scene; public class PacketSceneEnterStageScRsp : BasePacket { diff --git a/GameServer/Server/Packet/Send/Player/PacketSetClientPausedScRsp.cs b/GameServer/Server/Packet/Send/Scene/PacketSetClientPausedScRsp.cs similarity index 83% rename from GameServer/Server/Packet/Send/Player/PacketSetClientPausedScRsp.cs rename to GameServer/Server/Packet/Send/Scene/PacketSetClientPausedScRsp.cs index 419d9301..129d5a89 100644 --- a/GameServer/Server/Packet/Send/Player/PacketSetClientPausedScRsp.cs +++ b/GameServer/Server/Packet/Send/Scene/PacketSetClientPausedScRsp.cs @@ -1,7 +1,7 @@ using EggLink.DanhengServer.Kcp; using EggLink.DanhengServer.Proto; -namespace EggLink.DanhengServer.GameServer.Server.Packet.Send.Player; +namespace EggLink.DanhengServer.GameServer.Server.Packet.Send.Scene; public class PacketSetClientPausedScRsp : BasePacket { diff --git a/GameServer/Server/Packet/Send/Battle/PacketStartCocoonStageScRsp.cs b/GameServer/Server/Packet/Send/Scene/PacketStartCocoonStageScRsp.cs similarity index 91% rename from GameServer/Server/Packet/Send/Battle/PacketStartCocoonStageScRsp.cs rename to GameServer/Server/Packet/Send/Scene/PacketStartCocoonStageScRsp.cs index 147e8e99..6ae60dac 100644 --- a/GameServer/Server/Packet/Send/Battle/PacketStartCocoonStageScRsp.cs +++ b/GameServer/Server/Packet/Send/Scene/PacketStartCocoonStageScRsp.cs @@ -2,7 +2,7 @@ using EggLink.DanhengServer.Kcp; using EggLink.DanhengServer.Proto; -namespace EggLink.DanhengServer.GameServer.Server.Packet.Send.Battle; +namespace EggLink.DanhengServer.GameServer.Server.Packet.Send.Scene; public class PacketStartCocoonStageScRsp : BasePacket { diff --git a/GameServer/Server/Packet/Send/Mission/PacketChangeStoryLineFinishScNotify.cs b/GameServer/Server/Packet/Send/StoryLine/PacketChangeStoryLineFinishScNotify.cs similarity index 86% rename from GameServer/Server/Packet/Send/Mission/PacketChangeStoryLineFinishScNotify.cs rename to GameServer/Server/Packet/Send/StoryLine/PacketChangeStoryLineFinishScNotify.cs index b499abe2..9c023a55 100644 --- a/GameServer/Server/Packet/Send/Mission/PacketChangeStoryLineFinishScNotify.cs +++ b/GameServer/Server/Packet/Send/StoryLine/PacketChangeStoryLineFinishScNotify.cs @@ -1,7 +1,7 @@ using EggLink.DanhengServer.Kcp; using EggLink.DanhengServer.Proto; -namespace EggLink.DanhengServer.GameServer.Server.Packet.Send.Mission; +namespace EggLink.DanhengServer.GameServer.Server.Packet.Send.StoryLine; public class PacketChangeStoryLineFinishScNotify : BasePacket { diff --git a/GameServer/Server/Packet/Send/Mission/PacketGetStoryLineInfoScRsp.cs b/GameServer/Server/Packet/Send/StoryLine/PacketGetStoryLineInfoScRsp.cs similarity index 89% rename from GameServer/Server/Packet/Send/Mission/PacketGetStoryLineInfoScRsp.cs rename to GameServer/Server/Packet/Send/StoryLine/PacketGetStoryLineInfoScRsp.cs index 642910a4..1b496112 100644 --- a/GameServer/Server/Packet/Send/Mission/PacketGetStoryLineInfoScRsp.cs +++ b/GameServer/Server/Packet/Send/StoryLine/PacketGetStoryLineInfoScRsp.cs @@ -2,7 +2,7 @@ using EggLink.DanhengServer.Kcp; using EggLink.DanhengServer.Proto; -namespace EggLink.DanhengServer.GameServer.Server.Packet.Send.Mission; +namespace EggLink.DanhengServer.GameServer.Server.Packet.Send.StoryLine; public class PacketGetStoryLineInfoScRsp : BasePacket { diff --git a/GameServer/Server/Packet/Send/Mission/PacketStoryLineInfoScNotify.cs b/GameServer/Server/Packet/Send/StoryLine/PacketStoryLineInfoScNotify.cs similarity index 94% rename from GameServer/Server/Packet/Send/Mission/PacketStoryLineInfoScNotify.cs rename to GameServer/Server/Packet/Send/StoryLine/PacketStoryLineInfoScNotify.cs index 7386896c..30c84ff7 100644 --- a/GameServer/Server/Packet/Send/Mission/PacketStoryLineInfoScNotify.cs +++ b/GameServer/Server/Packet/Send/StoryLine/PacketStoryLineInfoScNotify.cs @@ -3,7 +3,7 @@ using EggLink.DanhengServer.GameServer.Game.Player; using EggLink.DanhengServer.Kcp; using EggLink.DanhengServer.Proto; -namespace EggLink.DanhengServer.GameServer.Server.Packet.Send.Mission; +namespace EggLink.DanhengServer.GameServer.Server.Packet.Send.StoryLine; public class PacketStoryLineInfoScNotify : BasePacket { diff --git a/GameServer/Server/Packet/Send/Scene/PacketGetFirstTalkByPerformanceNpcScRsp.cs b/GameServer/Server/Packet/Send/TalkEvent/PacketGetFirstTalkByPerformanceNpcScRsp.cs similarity index 88% rename from GameServer/Server/Packet/Send/Scene/PacketGetFirstTalkByPerformanceNpcScRsp.cs rename to GameServer/Server/Packet/Send/TalkEvent/PacketGetFirstTalkByPerformanceNpcScRsp.cs index 0a2dc2a9..72d70190 100644 --- a/GameServer/Server/Packet/Send/Scene/PacketGetFirstTalkByPerformanceNpcScRsp.cs +++ b/GameServer/Server/Packet/Send/TalkEvent/PacketGetFirstTalkByPerformanceNpcScRsp.cs @@ -1,7 +1,7 @@ using EggLink.DanhengServer.Kcp; using EggLink.DanhengServer.Proto; -namespace EggLink.DanhengServer.GameServer.Server.Packet.Send.Scene; +namespace EggLink.DanhengServer.GameServer.Server.Packet.Send.TalkEvent; public class PacketGetFirstTalkByPerformanceNpcScRsp : BasePacket { diff --git a/GameServer/Server/Packet/Send/Scene/PacketGetNpcTakenRewardScRsp.cs b/GameServer/Server/Packet/Send/TalkEvent/PacketGetNpcTakenRewardScRsp.cs similarity index 82% rename from GameServer/Server/Packet/Send/Scene/PacketGetNpcTakenRewardScRsp.cs rename to GameServer/Server/Packet/Send/TalkEvent/PacketGetNpcTakenRewardScRsp.cs index e2562b59..925812e5 100644 --- a/GameServer/Server/Packet/Send/Scene/PacketGetNpcTakenRewardScRsp.cs +++ b/GameServer/Server/Packet/Send/TalkEvent/PacketGetNpcTakenRewardScRsp.cs @@ -1,7 +1,7 @@ using EggLink.DanhengServer.Kcp; using EggLink.DanhengServer.Proto; -namespace EggLink.DanhengServer.GameServer.Server.Packet.Send.Scene; +namespace EggLink.DanhengServer.GameServer.Server.Packet.Send.TalkEvent; public class PacketGetNpcTakenRewardScRsp : BasePacket { diff --git a/GameServer/Server/Packet/Send/Mission/PacketSelectInclinationTextScRsp.cs b/GameServer/Server/Packet/Send/TalkEvent/PacketSelectInclinationTextScRsp.cs similarity index 83% rename from GameServer/Server/Packet/Send/Mission/PacketSelectInclinationTextScRsp.cs rename to GameServer/Server/Packet/Send/TalkEvent/PacketSelectInclinationTextScRsp.cs index 8ae12816..60971eff 100644 --- a/GameServer/Server/Packet/Send/Mission/PacketSelectInclinationTextScRsp.cs +++ b/GameServer/Server/Packet/Send/TalkEvent/PacketSelectInclinationTextScRsp.cs @@ -1,7 +1,7 @@ using EggLink.DanhengServer.Kcp; using EggLink.DanhengServer.Proto; -namespace EggLink.DanhengServer.GameServer.Server.Packet.Send.Mission; +namespace EggLink.DanhengServer.GameServer.Server.Packet.Send.TalkEvent; public class PacketSelectInclinationTextScRsp : BasePacket { diff --git a/GameServer/Server/Packet/Send/Tutorial/PacketFinishTutorialGuideScRsp.cs b/GameServer/Server/Packet/Send/Tutorial/PacketFinishTutorialGuideScRsp.cs index 7d0b15ff..3895f97f 100644 --- a/GameServer/Server/Packet/Send/Tutorial/PacketFinishTutorialGuideScRsp.cs +++ b/GameServer/Server/Packet/Send/Tutorial/PacketFinishTutorialGuideScRsp.cs @@ -17,7 +17,7 @@ public class PacketFinishTutorialGuideScRsp : BasePacket Reward = new ItemList() }; - rsp.Reward.ItemList_.Add(new Item + rsp.Reward.ItemList_.Add(new Proto.Item { ItemId = 1, Num = 1 diff --git a/WebServer/Response/InformationResponse.cs b/WebServer/Response/InformationResponse.cs index 9a8ab08c..02d610a1 100644 --- a/WebServer/Response/InformationResponse.cs +++ b/WebServer/Response/InformationResponse.cs @@ -52,7 +52,7 @@ public class PlayerInformationData // Player info [Newtonsoft.Json.JsonConverter(typeof(StringEnumConverter))] - [JsonConverter(typeof(JsonStringEnumConverter))] + [System.Text.Json.Serialization.JsonConverter(typeof(JsonStringEnumConverter))] public PlayerStatusEnum PlayerStatus { get; set; } = PlayerStatusEnum.Explore; [Newtonsoft.Json.JsonConverter(typeof(StringEnumConverter))]