Clean up imports

2025-12-12 17:44:37 +01:00 · 2025-03-20 18:06:02 -07:00
parent 75dafc17b2
commit 2273c3989e
160 changed files with 755 additions and 1844 deletions
--- a/Campofinale.Protocol/CsMsgId.cs
+++ b/Campofinale.Protocol/CsMsgId.cs
@@ -1,329 +1,323 @@
-using System;
+namespace Campofinale.Protocol
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 namespace Campofinale.Protocol
 {
-public enum CsMsgId : int
+    public enum CsMsgId : int
-{
+    {
-     CsMessageBegin = 0,
+         CsMessageBegin = 0,
-     CsLogin = 1,
+         CsLogin = 1,
-     CsCreateRole = 2,
+         CsCreateRole = 2,
-     CsLogout = 3,
+         CsLogout = 3,
-     CsGmCommand = 4,
+         CsGmCommand = 4,
-     CsPing = 5,
+         CsPing = 5,
-     CsFlushSync = 6,
+         CsFlushSync = 6,
-     CsSetName = 7,
+         CsSetName = 7,
-     CsSetGender = 8,
+         CsSetGender = 8,
-     CsCheckName = 9,
+         CsCheckName = 9,
-     CsCheckSensitive = 10,
+         CsCheckSensitive = 10,
-     CsAchieveBegin = 20,
+         CsAchieveBegin = 20,
-     CsAchieveComplete = 21,
+         CsAchieveComplete = 21,
-     CsAchieveTakeReward = 22,
+         CsAchieveTakeReward = 22,
-     CsAchieveEnd = 29,
+         CsAchieveEnd = 29,
-     CsCharBagBegin = 30,
+         CsCharBagBegin = 30,
-     CsCharBagTeamBegin = 31,
+         CsCharBagTeamBegin = 31,
-     CsCharBagSetTeam = 32,
+         CsCharBagSetTeam = 32,
-     CsCharBagSetCurrTeamIndex = 33,
+         CsCharBagSetCurrTeamIndex = 33,
-     CsCharBagSetTeamName = 34,
+         CsCharBagSetTeamName = 34,
-     CsCharBagSetTeamLeader = 35,
+         CsCharBagSetTeamLeader = 35,
-     CsCharBagTeamChangeFinish = 36,
+         CsCharBagTeamChangeFinish = 36,
-     CsCharBagTeamEnd = 37,
+         CsCharBagTeamEnd = 37,
-     CsCharBagEnd = 39,
+         CsCharBagEnd = 39,
-     CsCharBegin = 40,
+         CsCharBegin = 40,
-     CsCharLevelUp = 41,
+         CsCharLevelUp = 41,
-     CsCharSetNormalSkill = 43,
+         CsCharSetNormalSkill = 43,
-     CsCharSkillLevelUp = 45,
+         CsCharSkillLevelUp = 45,
-     CsCharSetTeamSkill = 46,
+         CsCharSetTeamSkill = 46,
-     CsCharPotentialUnlock = 47,
+         CsCharPotentialUnlock = 47,
-     CsCharEnd = 49,
+         CsCharEnd = 49,
-     CsEquipBegin = 50,
+         CsEquipBegin = 50,
-     CsEquipPuton = 51,
+         CsEquipPuton = 51,
-     CsEquipPutoff = 52,
+         CsEquipPutoff = 52,
-     CsEquipMedicineModify = 53,
+         CsEquipMedicineModify = 53,
-     CsEquipRecycle = 54,
+         CsEquipRecycle = 54,
-     CsEquipEnhance = 55,
+         CsEquipEnhance = 55,
-     CsEquipProduce = 57,
+         CsEquipProduce = 57,
-     CsEquipEnd = 59,
+         CsEquipEnd = 59,
-     CsSceneBegin = 80,
+         CsSceneBegin = 80,
-     CsEnterScene = 81,
+         CsEnterScene = 81,
-     CsMoveObjectMove = 82,
+         CsMoveObjectMove = 82,
-     CsSceneSetLastRecordCampid = 83,
+         CsSceneSetLastRecordCampid = 83,
-     CsSceneInteractiveEventTrigger = 84,
+         CsSceneInteractiveEventTrigger = 84,
-     CsSceneSetVar = 85,
+         CsSceneSetVar = 85,
-     CsSceneRest = 86,
+         CsSceneRest = 86,
-     CsSceneLoadFinish = 88,
+         CsSceneLoadFinish = 88,
-     CsSceneSetSafeZone = 95,
+         CsSceneSetSafeZone = 95,
-     CsSceneQueryEntityExist = 96,
+         CsSceneQueryEntityExist = 96,
-     CsSceneQueryInteractiveProperty = 97,
+         CsSceneQueryInteractiveProperty = 97,
-     CsSceneSetTrackPoint = 99,
+         CsSceneSetTrackPoint = 99,
-     CsSceneInteractTree = 100,
+         CsSceneInteractTree = 100,
-     CsSceneStaticMapMarkUpdate = 101,
+         CsSceneStaticMapMarkUpdate = 101,
-     CsSceneTeleport = 103,
+         CsSceneTeleport = 103,
-     CsSceneMoveStateSet = 104,
+         CsSceneMoveStateSet = 104,
-     CsSceneSubmitItem = 105,
+         CsSceneSubmitItem = 105,
-     CsSceneSubmitEther = 106,
+         CsSceneSubmitEther = 106,
-     CsSceneSetLevelScriptActive = 107,
+         CsSceneSetLevelScriptActive = 107,
-     CsSceneLevelScriptEventTrigger = 109,
+         CsSceneLevelScriptEventTrigger = 109,
-     CsSceneCommitLevelScriptCacheStep = 110,
+         CsSceneCommitLevelScriptCacheStep = 110,
-     CsSceneRepatriate = 115,
+         CsSceneRepatriate = 115,
-     CsSceneInteractSpInteractive = 116,
+         CsSceneInteractSpInteractive = 116,
-     CsSceneSetLastSafeZone = 117,
+         CsSceneSetLastSafeZone = 117,
-     CsSceneSetBattle = 118,
+         CsSceneSetBattle = 118,
-     CsSceneRevival = 119,
+         CsSceneRevival = 119,
-     CsSceneSetLevelScriptStart = 120,
+         CsSceneSetLevelScriptStart = 120,
-     CsSceneMonsterSpawnerBeginWave = 121,
+         CsSceneMonsterSpawnerBeginWave = 121,
-     CsSceneSpawnSummon = 122,
+         CsSceneSpawnSummon = 122,
-     CsSceneLeavePlane = 123,
+         CsSceneLeavePlane = 123,
-     CsSceneGradeModify = 124,
+         CsSceneGradeModify = 124,
-     CsSceneUpdateScriptTaskProgress = 125,
+         CsSceneUpdateScriptTaskProgress = 125,
-     CsSceneTeleportFinish = 126,
+         CsSceneTeleportFinish = 126,
-     CsSceneSetStorySafeZone = 127,
+         CsSceneSetStorySafeZone = 127,
-     CsSceneSubmitRecycle = 128,
+         CsSceneSubmitRecycle = 128,
-     CsSceneEnd = 199,
+         CsSceneEnd = 199,
-     CsFactoryBegin = 200,
+         CsFactoryBegin = 200,
-     CsFactorySttUnlockNode = 201,
+         CsFactorySttUnlockNode = 201,
-     CsFactorySttUnlockLayer = 202,
+         CsFactorySttUnlockLayer = 202,
-     CsFactoryManuallyWorkExec = 211,
+         CsFactoryManuallyWorkExec = 211,
-     CsFactoryProductManualUnlock = 212,
+         CsFactoryProductManualUnlock = 212,
-     CsFactoryQuickbarSetOne = 215,
+         CsFactoryQuickbarSetOne = 215,
-     CsFactoryQuickbarMoveOne = 216,
+         CsFactoryQuickbarMoveOne = 216,
-     CsFactorySoilReclaim = 217,
+         CsFactorySoilReclaim = 217,
-     CsFactorySoilWater = 218,
+         CsFactorySoilWater = 218,
-     CsFactorySoilCancel = 219,
+         CsFactorySoilCancel = 219,
-     CsFactorySoilHarvest = 220,
+         CsFactorySoilHarvest = 220,
-     CsFactorySoilFarmlandLevelUp = 221,
+         CsFactorySoilFarmlandLevelUp = 221,
-     CsFactoryHubWorkshopMake = 222,
+         CsFactoryHubWorkshopMake = 222,
-     CsFactoryHubTransportRouteSet = 223,
+         CsFactoryHubTransportRouteSet = 223,
-     CsFactoryHubTransportRouteReset = 224,
+         CsFactoryHubTransportRouteReset = 224,
-     CsFactoryHubTransportRouteRestart = 225,
+         CsFactoryHubTransportRouteRestart = 225,
-     CsFactoryHsFb = 232,
+         CsFactoryHsFb = 232,
-     CsFactoryStatisticSetBookmarkItemIds = 234,
+         CsFactoryStatisticSetBookmarkItemIds = 234,
-     CsFactoryStatisticRequire = 235,
+         CsFactoryStatisticRequire = 235,
-     CsFactoryPinSet = 236,
+         CsFactoryPinSet = 236,
-     CsFactoryOp = 251,
+         CsFactoryOp = 251,
-     CsFactoryObserverOp = 268,
+         CsFactoryObserverOp = 268,
-     CsFactoryEnd = 269,
+         CsFactoryEnd = 269,
-     CsWeaponBegin = 270,
+         CsWeaponBegin = 270,
-     CsWeaponPuton = 271,
+         CsWeaponPuton = 271,
-     CsWeaponBreakthrough = 273,
+         CsWeaponBreakthrough = 273,
-     CsWeaponAddExp = 274,
+         CsWeaponAddExp = 274,
-     CsWeaponAttachGem = 275,
+         CsWeaponAttachGem = 275,
-     CsWeaponDetachGem = 276,
+         CsWeaponDetachGem = 276,
-     CsWeaponRefineUpgrade = 277,
+         CsWeaponRefineUpgrade = 277,
-     CsWeaponEnd = 279,
+         CsWeaponEnd = 279,
-     CsWikiBegin = 290,
+         CsWikiBegin = 290,
-     CsUnlockWiki = 291,
+         CsUnlockWiki = 291,
-     CsMarkWikiRead = 292,
+         CsMarkWikiRead = 292,
-     CsWikiEnd = 299,
+         CsWikiEnd = 299,
-     CsMissionBegin = 310,
+         CsMissionBegin = 310,
-     CsFailMission = 311,
+         CsFailMission = 311,
-     CsTrackMission = 313,
+         CsTrackMission = 313,
-     CsStopTrackingMission = 314,
+         CsStopTrackingMission = 314,
-     CsUpdateQuestObjective = 315,
+         CsUpdateQuestObjective = 315,
-     CsAcceptMission = 316,
+         CsAcceptMission = 316,
-     CsRollBlocMission = 317,
+         CsRollBlocMission = 317,
-     CsMissionEventTrigger = 318,
+         CsMissionEventTrigger = 318,
-     CsMissionClientTriggerDone = 319,
+         CsMissionClientTriggerDone = 319,
-     CsSetNewMissionTagDone = 320,
+         CsSetNewMissionTagDone = 320,
-     CsMissionEnd = 329,
+         CsMissionEnd = 329,
-     CsGuideBegin = 330,
+         CsGuideBegin = 330,
-     CsCompleteGuideGroupKeyStep = 331,
+         CsCompleteGuideGroupKeyStep = 331,
-     CsCompleteGuideGroup = 332,
+         CsCompleteGuideGroup = 332,
-     CsGuideEnd = 339,
+         CsGuideEnd = 339,
-     CsDialogBegin = 340,
+         CsDialogBegin = 340,
-     CsFinishDialog = 341,
+         CsFinishDialog = 341,
-     CsDialogEnd = 349,
+         CsDialogEnd = 349,
-     CsBlocBegin = 350,
+         CsBlocBegin = 350,
-     CsBlocTakeLevelReward = 351,
+         CsBlocTakeLevelReward = 351,
-     CsBlocShopBuy = 352,
+         CsBlocShopBuy = 352,
-     CsBlocEnd = 360,
+         CsBlocEnd = 360,
-     CsDungeonBegin = 370,
+         CsDungeonBegin = 370,
-     CsEnterDungeon = 371,
+         CsEnterDungeon = 371,
-     CsRestartDungeon = 372,
+         CsRestartDungeon = 372,
-     CsLeaveDungeon = 373,
+         CsLeaveDungeon = 373,
-     CsDungeonRecoverAp = 375,
+         CsDungeonRecoverAp = 375,
-     CsDungeonTouchEntrance = 377,
+         CsDungeonTouchEntrance = 377,
-     CsDungeonEnd = 378,
+         CsDungeonEnd = 378,
-     CsEnterTrainDungeon = 379,
+         CsEnterTrainDungeon = 379,
-     CsGameMechanicsBegin = 380,
+         CsGameMechanicsBegin = 380,
-     CsGameMechanicsReqActive = 381,
+         CsGameMechanicsReqActive = 381,
-     CsGameMechanicsReqReward = 382,
+         CsGameMechanicsReqReward = 382,
-     CsGameMechanicsNtfInstPrepareFinish = 383,
+         CsGameMechanicsNtfInstPrepareFinish = 383,
-     CsGameMechanicsEnd = 399,
+         CsGameMechanicsEnd = 399,
-     CsMailBegin = 400,
+         CsMailBegin = 400,
-     CsGetMail = 401,
+         CsGetMail = 401,
-     CsReadMail = 402,
+         CsReadMail = 402,
-     CsDeleteMail = 403,
+         CsDeleteMail = 403,
-     CsDeleteAllMail = 404,
+         CsDeleteAllMail = 404,
-     CsGetMailAttachment = 405,
+         CsGetMailAttachment = 405,
-     CsGetAllMailAttachment = 406,
+         CsGetAllMailAttachment = 406,
-     CsMarkStarMail = 407,
+         CsMarkStarMail = 407,
-     CsMailEnd = 419,
+         CsMailEnd = 419,
-     CsRedDotBegin = 430,
+         CsRedDotBegin = 430,
-     CsRemoveItemNewTags = 431,
+         CsRemoveItemNewTags = 431,
-     CsRedDotReadFormula = 432,
+         CsRedDotReadFormula = 432,
-     CsRedDotReadCharDoc = 433,
+         CsRedDotReadCharDoc = 433,
-     CsRedDotReadCharVoice = 434,
+         CsRedDotReadCharVoice = 434,
-     CsRedDotReadEquipFormula = 435,
+         CsRedDotReadEquipFormula = 435,
-     CsRedDotEnd = 440,
+         CsRedDotEnd = 440,
-     CsPrtsBegin = 441,
+         CsPrtsBegin = 441,
-     CsPrtsMarkRead = 442,
+         CsPrtsMarkRead = 442,
-     CsPrtsMarkTerminalRead = 443,
+         CsPrtsMarkTerminalRead = 443,
-     CsPrtsRichContentRead = 444,
+         CsPrtsRichContentRead = 444,
-     CsPrtsFinishInvestigate = 445,
+         CsPrtsFinishInvestigate = 445,
-     CsPrtsEnd = 449,
+         CsPrtsEnd = 449,
-     CsBitsetBegin = 480,
+         CsBitsetBegin = 480,
-     CsBitsetAdd = 481,
+         CsBitsetAdd = 481,
-     CsBitsetRemove = 482,
+         CsBitsetRemove = 482,
-     CsBitsetRemoveAll = 483,
+         CsBitsetRemoveAll = 483,
-     CsBitsetEnd = 499,
+         CsBitsetEnd = 499,
-     CsMergeMsg = 500,
+         CsMergeMsg = 500,
-     CsPayBegin = 510,
+         CsPayBegin = 510,
-     CsCreateOrder = 511,
+         CsCreateOrder = 511,
-     CsPayEnd = 529,
+         CsPayEnd = 529,
-     CsFriendBegin = 530,
+         CsFriendBegin = 530,
-     CsFriendRequestSubmit = 531,
+         CsFriendRequestSubmit = 531,
-     CsFriendRequestReject = 532,
+         CsFriendRequestReject = 532,
-     CsFriendRequestAccept = 533,
+         CsFriendRequestAccept = 533,
-     CsFriendDelete = 534,
+         CsFriendDelete = 534,
-     CsFriendSearchName = 535,
+         CsFriendSearchName = 535,
-     CsFriendRequestListSync = 536,
+         CsFriendRequestListSync = 536,
-     CsFriendListSync = 537,
+         CsFriendListSync = 537,
-     CsFriendEnd = 570,
+         CsFriendEnd = 570,
-     CsWalletBegin = 600,
+         CsWalletBegin = 600,
-     CsMoneyChange = 601,
+         CsMoneyChange = 601,
-     CsWalletEnd = 630,
+         CsWalletEnd = 630,
-     CsGameVarBegin = 631,
+         CsGameVarBegin = 631,
-     CsUpdateClientGameVar = 632,
+         CsUpdateClientGameVar = 632,
-     CsGameVarEnd = 640,
+         CsGameVarEnd = 640,
-     CsMiniGameBegin = 641,
+         CsMiniGameBegin = 641,
-     CsCompleteMiniGame = 642,
+         CsCompleteMiniGame = 642,
-     CsMiniGameEnd = 650,
+         CsMiniGameEnd = 650,
-     CsRpgDungeonBegin = 651,
+         CsRpgDungeonBegin = 651,
-     CsRpgDungeonBuy = 652,
+         CsRpgDungeonBuy = 652,
-     CsRpgDungeonSell = 653,
+         CsRpgDungeonSell = 653,
-     CsRpgDungeonEquipPuton = 654,
+         CsRpgDungeonEquipPuton = 654,
-     CsRpgDungeonEquipPutoff = 655,
+         CsRpgDungeonEquipPutoff = 655,
-     CsRpgDungeonPickLvAbility = 656,
+         CsRpgDungeonPickLvAbility = 656,
-     CsRpgDungeonTimeStop = 657,
+         CsRpgDungeonTimeStop = 657,
-     CsRpgDungeonAbilityChange = 658,
+         CsRpgDungeonAbilityChange = 658,
-     CsRpgDungeonEnd = 700,
+         CsRpgDungeonEnd = 700,
-     CsGemBegin = 801,
+         CsGemBegin = 801,
-     CsGemRecast = 802,
+         CsGemRecast = 802,
-     CsGemEnd = 820,
+         CsGemEnd = 820,
-     CsSnsBegin = 701,
+         CsSnsBegin = 701,
-     CsSnsGetList = 702,
+         CsSnsGetList = 702,
-     CsSnsMomentOption = 703,
+         CsSnsMomentOption = 703,
-     CsSnsChatDialogOption = 704,
+         CsSnsChatDialogOption = 704,
-     CsSnsMomentRead = 705,
+         CsSnsMomentRead = 705,
-     CsSnsFinishDialog = 706,
+         CsSnsFinishDialog = 706,
-     CsSnsReadDialog = 707,
+         CsSnsReadDialog = 707,
-     CsSnsEnd = 730,
+         CsSnsEnd = 730,
-     CsSpaceshipBegin = 751,
+         CsSpaceshipBegin = 751,
-     CsSpaceshipBuildRoom = 752,
+         CsSpaceshipBuildRoom = 752,
-     CsSpaceshipLevelUpRoom = 753,
+         CsSpaceshipLevelUpRoom = 753,
-     CsSpaceshipStationChar = 754,
+         CsSpaceshipStationChar = 754,
-     CsSpaceshipStationCharChangeWorkState = 755,
+         CsSpaceshipStationCharChangeWorkState = 755,
-     CsSpaceshipPresentGiftToChar = 756,
+         CsSpaceshipPresentGiftToChar = 756,
-     CsSpaceshipRecvGiftFromChar = 757,
+         CsSpaceshipRecvGiftFromChar = 757,
-     CsSpaceshipManufacturingBegin = 771,
+         CsSpaceshipManufacturingBegin = 771,
-     CsSpaceshipManufacturingStationStart = 772,
+         CsSpaceshipManufacturingStationStart = 772,
-     CsSpaceshipManufacturingStationCollect = 775,
+         CsSpaceshipManufacturingStationCollect = 775,
-     CsSpaceshipManufacturingStationCancel = 776,
+         CsSpaceshipManufacturingStationCancel = 776,
-     CsSpaceshipManufacturingStationChangeOrder = 777,
+         CsSpaceshipManufacturingStationChangeOrder = 777,
-     CsSpaceshipManufacturingEnd = 785,
+         CsSpaceshipManufacturingEnd = 785,
-     CsSpaceshipGrowCabinBegin = 786,
+         CsSpaceshipGrowCabinBegin = 786,
-     CsSpaceshipGrowCabinBreed = 787,
+         CsSpaceshipGrowCabinBreed = 787,
-     CsSpaceshipGrowCabinSow = 788,
+         CsSpaceshipGrowCabinSow = 788,
-     CsSpaceshipGrowCabinHarvest = 789,
+         CsSpaceshipGrowCabinHarvest = 789,
-     CsSpaceshipGrowCabinCancel = 790,
+         CsSpaceshipGrowCabinCancel = 790,
-     CsSpaceshipGrowCabinClearPreviewRecipe = 791,
+         CsSpaceshipGrowCabinClearPreviewRecipe = 791,
-     CsSpaceshipGrowCabinEnd = 799,
+         CsSpaceshipGrowCabinEnd = 799,
-     CsSpaceshipEnd = 800,
+         CsSpaceshipEnd = 800,
-     CsTdBegin = 821,
+         CsTdBegin = 821,
-     CsTdGetTdList = 822,
+         CsTdGetTdList = 822,
-     CsTdStart = 823,
+         CsTdStart = 823,
-     CsTdLeave = 825,
+         CsTdLeave = 825,
-     CsTdBuyBuilding = 826,
+         CsTdBuyBuilding = 826,
-     CsTdPickDropItem = 827,
+         CsTdPickDropItem = 827,
-     CsTdDropExpired = 828,
+         CsTdDropExpired = 828,
-     CsTdEnd = 899,
+         CsTdEnd = 899,
-     CsBuffBegin = 900,
+         CsBuffBegin = 900,
-     CsBattleOp = 901,
+         CsBattleOp = 901,
-     CsDevClearBattleInfo = 902,
+         CsDevClearBattleInfo = 902,
-     CsBuffEnd = 950,
+         CsBuffEnd = 950,
-     CsSkillBegin = 960,
+         CsSkillBegin = 960,
-     CsCastSkill = 961,
+         CsCastSkill = 961,
-     CsCastSkillEnd = 962,
+         CsCastSkillEnd = 962,
-     CsCastSkillEffect = 963,
+         CsCastSkillEffect = 963,
-     CsSkillEnd = 999,
+         CsSkillEnd = 999,
-     CsItemBagBegin = 1000,
+         CsItemBagBegin = 1000,
-     CsItemBagTidyInBag = 1001,
+         CsItemBagTidyInBag = 1001,
-     CsItemBagMoveInBag = 1002,
+         CsItemBagMoveInBag = 1002,
-     CsItemBagSplitInBag = 1003,
+         CsItemBagSplitInBag = 1003,
-     CsItemBagFactoryDepotToBag = 1004,
+         CsItemBagFactoryDepotToBag = 1004,
-     CsItemBagBagToFactoryDepot = 1005,
+         CsItemBagBagToFactoryDepot = 1005,
-     CsItemBagFactoryDepotToBagGrid = 1006,
+         CsItemBagFactoryDepotToBagGrid = 1006,
-     CsItemBagUseItem = 1007,
+         CsItemBagUseItem = 1007,
-     CsItemBagSetQuickBar = 1008,
+         CsItemBagSetQuickBar = 1008,
-     CsItemBagSetQuickBarPos = 1009,
+         CsItemBagSetQuickBarPos = 1009,
-     CsItemBagSetItemLock = 1010,
+         CsItemBagSetItemLock = 1010,
-     CsItemBagAbandonInBag = 1011,
+         CsItemBagAbandonInBag = 1011,
-     CsItemBagDestroyInDepot = 1012,
+         CsItemBagDestroyInDepot = 1012,
-     CsItemBagDestroyInFactoryDepot = 1013,
+         CsItemBagDestroyInFactoryDepot = 1013,
-     CsItemBagDumpBottleInBag = 1014,
+         CsItemBagDumpBottleInBag = 1014,
-     CsItemBagDumpBottleInFactoryDepot = 1015,
+         CsItemBagDumpBottleInFactoryDepot = 1015,
-     CsItemBagTakeoutLostAndFound = 1031,
+         CsItemBagTakeoutLostAndFound = 1031,
-     CsItemBagUseItemCase = 1032,
+         CsItemBagUseItemCase = 1032,
-     CsItemBagChgSpaceshipChapter = 1033,
+         CsItemBagChgSpaceshipChapter = 1033,
-     CsItemBagEnd = 1049,
+         CsItemBagEnd = 1049,
-     CsSettlementBegin = 1050,
+         CsSettlementBegin = 1050,
-     CsSettlementSelectRequire = 1051,
+         CsSettlementSelectRequire = 1051,
-     CsSettlementSetOfficer = 1052,
+         CsSettlementSetOfficer = 1052,
-     CsSettlementSetSubmitMode = 1053,
+         CsSettlementSetSubmitMode = 1053,
-     CsSettlementSubmitRequire = 1054,
+         CsSettlementSubmitRequire = 1054,
-     CsSettlementEnd = 1099,
+         CsSettlementEnd = 1099,
-     CsShopBegin = 1100,
+         CsShopBegin = 1100,
-     CsShopBuy = 1111,
+         CsShopBuy = 1111,
-     CsShopSwapMoney = 1112,
+         CsShopSwapMoney = 1112,
-     CsShopEnd = 1149,
+         CsShopEnd = 1149,
-     CsAdventureBegin = 1150,
+         CsAdventureBegin = 1150,
-     CsAdventureTakeRewardAll = 1151,
+         CsAdventureTakeRewardAll = 1151,
-     CsAdventureEnd = 1179,
+         CsAdventureEnd = 1179,
-     CsAdventureBookBegin = 1250,
+         CsAdventureBookBegin = 1250,
-     CsTakeAllAdventureTaskReward = 1251,
+         CsTakeAllAdventureTaskReward = 1251,
-     CsTakeAdventureTaskReward = 1252,
+         CsTakeAdventureTaskReward = 1252,
-     CsTakeAdventureBookStageReward = 1253,
+         CsTakeAdventureBookStageReward = 1253,
-     CsAdventureBookEnd = 1299,
+         CsAdventureBookEnd = 1299,
-     CsTalentBegin = 1300,
+         CsTalentBegin = 1300,
-     CsCharUnlockTalentNode = 1301,
+         CsCharUnlockTalentNode = 1301,
-     CsTalentEnd = 1329,
+         CsTalentEnd = 1329,
-     CsRacingDungeonBegin = 1330,
+         CsRacingDungeonBegin = 1330,
-     CsRacingDungeonBattlePassReceiveReward = 1332,
+         CsRacingDungeonBattlePassReceiveReward = 1332,
-     CsRacingDungeonGetBattlePass = 1333,
+         CsRacingDungeonGetBattlePass = 1333,
-     CsRacingDungeonGetAchievement = 1334,
+         CsRacingDungeonGetAchievement = 1334,
-     CsRacingDungeonAchievementReceiveReward = 1335,
+         CsRacingDungeonAchievementReceiveReward = 1335,
-     CsRacingDungeonLeave = 1336,
+         CsRacingDungeonLeave = 1336,
-     CsRacingDungeonUpdateBattleInfo = 1337,
+         CsRacingDungeonUpdateBattleInfo = 1337,
-     CsRacingDungeonEnd = 1400,
+         CsRacingDungeonEnd = 1400,
-     CsTrialCharacterBegin = 1401,
+         CsTrialCharacterBegin = 1401,
-     CsUseTrialCharacterEquipMedicine = 1402,
+         CsUseTrialCharacterEquipMedicine = 1402,
-     CsTrialCharacterEnd = 1403,
+         CsTrialCharacterEnd = 1403,
-     CsGachaBegin = 1431,
+         CsGachaBegin = 1431,
-     CsGachaSinglePullReq = 1432,
+         CsGachaSinglePullReq = 1432,
-     CsGachaTenPullReq = 1433,
+         CsGachaTenPullReq = 1433,
-     CsGachaEnd = 1450,
+         CsGachaEnd = 1450,
-     CsGameTimeFreezeBegin = 1451,
+         CsGameTimeFreezeBegin = 1451,
-     CsGameTimeFreezeStartReq = 1452,
+         CsGameTimeFreezeStartReq = 1452,
-     CsGameTimeFreezeEndReq = 1453,
+         CsGameTimeFreezeEndReq = 1453,
-     CsGameTimeFreezeEnd = 1460,
+         CsGameTimeFreezeEnd = 1460,
-     CsActivityBegin = 1461,
+         CsActivityBegin = 1461,
-     CsDailyCheckin = 1471,
+         CsDailyCheckin = 1471,
-     CsActivityEnd = 1510,
+         CsActivityEnd = 1510,
-     CsMessageEnd = 4095,
+         CsMessageEnd = 4095,
-}
+    }
 }
--- a/Campofinale.Protocol/ScMsgId.cs
+++ b/Campofinale.Protocol/ScMsgId.cs
@@ -1,401 +1,395 @@
-using System;
+namespace Campofinale.Protocol
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 namespace Campofinale.Protocol
 {
-public enum ScMsgId : int
+    public enum ScMsgId : int
-{
+    {
-    ScMessageBegin = 0,
+        ScMessageBegin = 0,
-    ScLogin = 1,
+        ScLogin = 1,
-    ScSyncBaseData = 2,
+        ScSyncBaseData = 2,
-    ScNtfErrorCode = 3,
+        ScNtfErrorCode = 3,
-    ScGmCommand = 4,
+        ScGmCommand = 4,
-    ScPing = 5,
+        ScPing = 5,
-    ScReconnectIncr = 6,
+        ScReconnectIncr = 6,
-    ScReconnectFull = 7,
+        ScReconnectFull = 7,
-    ScFlushSync = 8,
+        ScFlushSync = 8,
-    ScNtfCode = 9,
+        ScNtfCode = 9,
-    ScSetName = 10,
+        ScSetName = 10,
-    ScSetGender = 11,
+        ScSetGender = 11,
-    ScCheckName = 12,
+        ScCheckName = 12,
-    ScCheckSensitive = 13,
+        ScCheckSensitive = 13,
-    ScSyncFullDataEnd = 14,//
+        ScSyncFullDataEnd = 14,//
-    ScAchieveComplete = 15,
+        ScAchieveComplete = 15,
-    ScSyncAllRoleScene = 20,//
+        ScSyncAllRoleScene = 20,//
-    ScObjectEnterView = 21,
+        ScObjectEnterView = 21,
-    ScObjectLeaveView = 22,
+        ScObjectLeaveView = 22,
-    ScMoveObjectMove = 23,
+        ScMoveObjectMove = 23,
-    ScEnterSceneNotify = 24,
+        ScEnterSceneNotify = 24,
-    ScSelfSceneInfo = 25,
+        ScSelfSceneInfo = 25,
-    ScLeaveSceneNotify = 26,
+        ScLeaveSceneNotify = 26,
-    ScSceneSetLastRecordCampid = 27,
+        ScSceneSetLastRecordCampid = 27,
-    ScSceneUpdateInteractiveProperty = 28,
+        ScSceneUpdateInteractiveProperty = 28,
-    ScSceneSetVar = 29,
+        ScSceneSetVar = 29,
-    ScSceneRevival = 30,
+        ScSceneRevival = 30,
-    ScSceneCreateEntity = 31,
+        ScSceneCreateEntity = 31,
-    ScSceneDestroyEntity = 32,
+        ScSceneDestroyEntity = 32,
-    ScSceneSetSafeZone = 35,
+        ScSceneSetSafeZone = 35,
-    ScSceneQueryEntityExist = 36,
+        ScSceneQueryEntityExist = 36,
-    ScSceneLevelScriptStateNotify = 37,
+        ScSceneLevelScriptStateNotify = 37,
-    ScSceneQueryInteractiveProperty = 38,
+        ScSceneQueryInteractiveProperty = 38,
-    ScSceneUnlockArea = 39,
+        ScSceneUnlockArea = 39,
-    ScSceneSetTrackPoint = 40,
+        ScSceneSetTrackPoint = 40,
-    ScSceneCollectionSync = 42, //
+        ScSceneCollectionSync = 42, //
-    ScSceneCollectionModify = 43,
+        ScSceneCollectionModify = 43,
-    ScSceneMapMarkSync = 44,//
+        ScSceneMapMarkSync = 44,//
-    ScSceneStaticMapMarkModify = 45,
+        ScSceneStaticMapMarkModify = 45,
-    ScSceneTeleport = 46,
+        ScSceneTeleport = 46,
-    ScSceneSubmitItem = 47,
+        ScSceneSubmitItem = 47,
-    ScSceneSubmitEther = 48,
+        ScSceneSubmitEther = 48,
-    ScSceneUpdateLevelScriptProperty = 49,
+        ScSceneUpdateLevelScriptProperty = 49,
-    ScSceneResetEntity = 50,
+        ScSceneResetEntity = 50,
-    ScSceneLevelScriptResetBegin = 51,
+        ScSceneLevelScriptResetBegin = 51,
-    ScSceneLevelScriptResetEnd = 52,
+        ScSceneLevelScriptResetEnd = 52,
-    ScSceneSetBattle = 53,
+        ScSceneSetBattle = 53,
-    ScSceneLevelScriptEventTrigger = 55,
+        ScSceneLevelScriptEventTrigger = 55,
-    ScSceneInteractiveEventTrigger = 56,
+        ScSceneInteractiveEventTrigger = 56,
-    ScSceneTriggerClientLevelScriptEvent = 57,
+        ScSceneTriggerClientLevelScriptEvent = 57,
-    ScSceneTriggerClientInteractiveEvent = 58,
+        ScSceneTriggerClientInteractiveEvent = 58,
-    ScSceneCrossSceneStatus = 59,
+        ScSceneCrossSceneStatus = 59,
-    ScSceneDropCreate = 800,
+        ScSceneDropCreate = 800,
-    ScSceneDropDelete = 801,
+        ScSceneDropDelete = 801,
-    ScSceneDropModify = 802,
+        ScSceneDropModify = 802,
-    ScSceneGradeChangeNotify = 803,
+        ScSceneGradeChangeNotify = 803,
-    ScSeamlessSceneDestroyNotify = 804,
+        ScSeamlessSceneDestroyNotify = 804,
-    ScSceneMonsterSpawnerStart = 805,
+        ScSceneMonsterSpawnerStart = 805,
-    ScSceneMonsterSpawnerStop = 806,
+        ScSceneMonsterSpawnerStop = 806,
-    ScSceneMonsterSpawnerComplete = 807,
+        ScSceneMonsterSpawnerComplete = 807,
-    ScSceneMonsterSpawnerBeginWave = 808,
+        ScSceneMonsterSpawnerBeginWave = 808,
-    ScSceneMonsterSpawnerWaveComplete = 809,
+        ScSceneMonsterSpawnerWaveComplete = 809,
-    ScSceneMonsterSpawnerObjectDataBegin = 811,
+        ScSceneMonsterSpawnerObjectDataBegin = 811,
-    ScSceneMonsterSpawnerObjectDataEnd = 812,
+        ScSceneMonsterSpawnerObjectDataEnd = 812,
-    ScSceneLevelScriptTaskStateUpdate = 813,
+        ScSceneLevelScriptTaskStateUpdate = 813,
-    ScSceneClientIdInfo = 814,
+        ScSceneClientIdInfo = 814,
-    ScSceneLevelScriptTaskProgressUpdate = 815,
+        ScSceneLevelScriptTaskProgressUpdate = 815,
-    ScSceneLevelScriptTaskStartFinish = 816,
+        ScSceneLevelScriptTaskStartFinish = 816,
-    ScSceneInteractSpInteractive = 817,
+        ScSceneInteractSpInteractive = 817,
-    ScSceneUpdateInteractiveMeta = 818,
+        ScSceneUpdateInteractiveMeta = 818,
-    ScSceneGradeModify = 819,
+        ScSceneGradeModify = 819,
-    ScSceneSetStorySafeZone = 820,
+        ScSceneSetStorySafeZone = 820,
-    ScSceneRepatriate = 821,
+        ScSceneRepatriate = 821,
-    ScSceneSubmitRecycle = 822,
+        ScSceneSubmitRecycle = 822,
-    ScSceneLevelScriptSetDone = 823,
+        ScSceneLevelScriptSetDone = 823,
-    ScSyncCharBagInfo = 60,//
+        ScSyncCharBagInfo = 60,//
-    ScCharBagAddChar = 61,
+        ScCharBagAddChar = 61,
-    ScCharBagSetTeam = 62,
+        ScCharBagSetTeam = 62,
-    ScCharBagSetCurrTeamIndex = 63,
+        ScCharBagSetCurrTeamIndex = 63,
-    ScCharBagSetTeamName = 64,
+        ScCharBagSetTeamName = 64,
-    ScCharBagSetTeamLeader = 65,
+        ScCharBagSetTeamLeader = 65,
-    ScCharBagSetMaxTeamMemberCount = 66,
+        ScCharBagSetMaxTeamMemberCount = 66,
-    ScCharBagTeamLeaderNotMatchNtf = 67,
+        ScCharBagTeamLeaderNotMatchNtf = 67,
-    ScCharBagDelChar = 68,
+        ScCharBagDelChar = 68,
-    ScCharBagAddCharWithConversionNotify = 69,
+        ScCharBagAddCharWithConversionNotify = 69,
-    ScSyncWallet = 70,//
+        ScSyncWallet = 70,//
-    ScWalletSyncMoney = 71,
+        ScWalletSyncMoney = 71,
-    ScCharSkillInfos = 78,
+        ScCharSkillInfos = 78,
-    ScCharPotentialUnlock = 79,
+        ScCharPotentialUnlock = 79,
-    ScCharLevelUp = 80,
+        ScCharLevelUp = 80,
-    ScCharSyncLevelExp = 82,
+        ScCharSyncLevelExp = 82,
-    ScCharSetNormalSkill = 83,
+        ScCharSetNormalSkill = 83,
-    ScCharSkillLevelUp = 84,
+        ScCharSkillLevelUp = 84,
-    ScCharUnlockSkill = 85,
+        ScCharUnlockSkill = 85,
-    ScCharGainExpToast = 86,
+        ScCharGainExpToast = 86,
-    ScCharSyncStatus = 87,
+        ScCharSyncStatus = 87,
-    ScCharSetTeamSkill = 89,
+        ScCharSetTeamSkill = 89,
-    ScEquipPuton = 90,
+        ScEquipPuton = 90,
-    ScEquipPutoff = 91,
+        ScEquipPutoff = 91,
-    ScEquipMedicineModify = 92,
+        ScEquipMedicineModify = 92,
-    ScEquipRecycle = 93,
+        ScEquipRecycle = 93,
-    ScEquipEnhance = 94,
+        ScEquipEnhance = 94,
-    ScEquipProduce = 96,
+        ScEquipProduce = 96,
-    ScSyncAllMission = 110,//
+        ScSyncAllMission = 110,//
-    ScQuestStateUpdate = 111,
+        ScQuestStateUpdate = 111,
-    ScMissionStateUpdate = 112,
+        ScMissionStateUpdate = 112,
-    ScQuestFailed = 113,
+        ScQuestFailed = 113,
-    ScMissionFailed = 114,
+        ScMissionFailed = 114,
-    ScTrackMissionChange = 115,
+        ScTrackMissionChange = 115,
-    ScQuestObjectivesUpdate = 116,
+        ScQuestObjectivesUpdate = 116,
-    ScMissionDeleted = 117,
+        ScMissionDeleted = 117,
-    ScRollBlocMission = 120,
+        ScRollBlocMission = 120,
-    ScSyncBlocMissionInfo = 121,//
+        ScSyncBlocMissionInfo = 121,//
-    ScBlocCompletedMissionNumUpdate = 122,
+        ScBlocCompletedMissionNumUpdate = 122,
-    ScQuestRollback = 123,
+        ScQuestRollback = 123,
-    ScUpdateMissionProperty = 124,
+        ScUpdateMissionProperty = 124,
-    ScSceneTriggerClientMissionEvent = 125,
+        ScSceneTriggerClientMissionEvent = 125,
-    ScMissionEventTrigger = 126,
+        ScMissionEventTrigger = 126,
-    ScDailyMissionInfoUpdate = 127,
+        ScDailyMissionInfoUpdate = 127,
-    ScSyncAllDialog = 130,//
+        ScSyncAllDialog = 130,//
-    ScFinishDialog = 131,
+        ScFinishDialog = 131,
-    ScSyncAllGuide = 140,//
+        ScSyncAllGuide = 140,//
-    ScCompleteGuideGroupKeyStep = 141,
+        ScCompleteGuideGroupKeyStep = 141,
-    ScCompleteGuideGroup = 142,
+        ScCompleteGuideGroup = 142,
-    ScAcceptGuideGroup = 143,
+        ScAcceptGuideGroup = 143,
-    ScSyncAttr = 150,
+        ScSyncAttr = 150,
-    ScSyncAllUnlock = 160,//
+        ScSyncAllUnlock = 160,//
-    ScUnlockSystem = 161,
+        ScUnlockSystem = 161,
-    ScSyncAllBitset = 165,//
+        ScSyncAllBitset = 165,//
-    ScBitsetAdd = 166,
+        ScBitsetAdd = 166,
-    ScBitsetRemove = 167,
+        ScBitsetRemove = 167,
-    ScBitsetRemoveAll = 168,
+        ScBitsetRemoveAll = 168,
-    ScFactorySync = 200,//
+        ScFactorySync = 200,//
-    ScFactoryModifyFormulaMan = 201,
+        ScFactoryModifyFormulaMan = 201,
-    ScFactoryModifyStt = 202,
+        ScFactoryModifyStt = 202,
-    ScFactoryModifyVisibleFormula = 203,
+        ScFactoryModifyVisibleFormula = 203,
-    ScFactoryModifyFormulaMode = 204,
+        ScFactoryModifyFormulaMode = 204,
-    ScFactorySyncOfflineInfo = 205,//
+        ScFactorySyncOfflineInfo = 205,//
-    ScFactorySyncScope = 210,//
+        ScFactorySyncScope = 210,//
-    ScFactoryReleaseScope = 211,
+        ScFactoryReleaseScope = 211,
-    ScFactoryModifyScope = 212,
+        ScFactoryModifyScope = 212,
-    ScFactoryModifyQuickbar = 213,
+        ScFactoryModifyQuickbar = 213,
-    ScFactoryManuallyWorkExec = 214,
+        ScFactoryManuallyWorkExec = 214,
-    ScFactoryProductManualUnlock = 215,
+        ScFactoryProductManualUnlock = 215,
-    ScFactoryModifySoil = 216,
+        ScFactoryModifySoil = 216,
-    ScFactorySoilReclaim = 217,
+        ScFactorySoilReclaim = 217,
-    ScFactorySoilWater = 218,
+        ScFactorySoilWater = 218,
-    ScFactorySoilCancel = 219,
+        ScFactorySoilCancel = 219,
-    ScFactorySoilHarvest = 220,
+        ScFactorySoilHarvest = 220,
-    ScFactorySyncChapter = 221,//
+        ScFactorySyncChapter = 221,//
-    ScFactoryModifyChapterNodes = 222,
+        ScFactoryModifyChapterNodes = 222,
-    ScFactoryModifyChapterComponents = 223,
+        ScFactoryModifyChapterComponents = 223,
-    ScFactoryModifyChapterScene = 224,
+        ScFactoryModifyChapterScene = 224,
-    ScFactoryModifyChapterBlackboard = 225,
+        ScFactoryModifyChapterBlackboard = 225,
-    ScFactoryModifyChapterPinBoard = 226,
+        ScFactoryModifyChapterPinBoard = 226,
-    ScFactoryModifyChapterMap = 227,
+        ScFactoryModifyChapterMap = 227,
-    ScFactoryHs = 231,
+        ScFactoryHs = 231,
-    ScFactoryHsSync = 232,//
+        ScFactoryHsSync = 232,//
-    ScFactorySyncStatistic = 241,
+        ScFactorySyncStatistic = 241,
-    ScFactoryModifyStatistic = 242,
+        ScFactoryModifyStatistic = 242,
-    ScFactoryStatisticRequire = 243,
+        ScFactoryStatisticRequire = 243,
-    ScFactoryHubWorkshopMake = 244,
+        ScFactoryHubWorkshopMake = 244,
-    ScFactoryHubTransportRouteModify = 245,
+        ScFactoryHubTransportRouteModify = 245,
-    ScFactoryModifyStatisticBookmark = 246,
+        ScFactoryModifyStatisticBookmark = 246,
-    ScFactoryOpRet = 251,
+        ScFactoryOpRet = 251,
-    ScFactoryObserverRet = 259,
+        ScFactoryObserverRet = 259,
-    ScWeaponPuton = 260,
+        ScWeaponPuton = 260,
-    ScWeaponBreakthrough = 262,
+        ScWeaponBreakthrough = 262,
-    ScWeaponAddExp = 263,
+        ScWeaponAddExp = 263,
-    ScWeaponAttachGem = 264,
+        ScWeaponAttachGem = 264,
-    ScWeaponDetachGem = 265,
+        ScWeaponDetachGem = 265,
-    ScWeaponRefineUpgrade = 266,
+        ScWeaponRefineUpgrade = 266,
-    ScRewardToastBegin = 270,
+        ScRewardToastBegin = 270,
-    ScRewardToastEnd = 271,
+        ScRewardToastEnd = 271,
-    ScRewardDropMoneyToast = 272,
+        ScRewardDropMoneyToast = 272,
-    ScRewardToSceneBegin = 273,
+        ScRewardToSceneBegin = 273,
-    ScRewardToSceneEnd = 274,
+        ScRewardToSceneEnd = 274,
-    ScRewardDropSpItemToast = 275,
+        ScRewardDropSpItemToast = 275,
-    ScSyncAllBloc = 280,//
+        ScSyncAllBloc = 280,//
-    ScBlocSyncLevel = 281,
+        ScBlocSyncLevel = 281,
-    ScBlocTakeLevelReward = 282,
+        ScBlocTakeLevelReward = 282,
-    ScBlocShopBuy = 283,
+        ScBlocShopBuy = 283,
-    ScDungeonBegin = 300,
+        ScDungeonBegin = 300,
-    ScEnterDungeon = 301,
+        ScEnterDungeon = 301,
-    ScRestartDungeon = 302,
+        ScRestartDungeon = 302,
-    ScLeaveDungeon = 303,
+        ScLeaveDungeon = 303,
-    ScSyncStamina = 304,
+        ScSyncStamina = 304,
-    ScSyncFullDungeonStatus = 306,
+        ScSyncFullDungeonStatus = 306,
-    ScDungeonEnd = 359,
+        ScDungeonEnd = 359,
-    ScSyncAllMail = 400,//
+        ScSyncAllMail = 400,//
-    ScGetMail = 401,
+        ScGetMail = 401,
-    ScReadMail = 402,
+        ScReadMail = 402,
-    ScGetMailAttachment = 403,
+        ScGetMailAttachment = 403,
-    ScDelMailNotify = 404,
+        ScDelMailNotify = 404,
-    ScNewMailNotify = 405,
+        ScNewMailNotify = 405,
-    ScMarkStarMail = 406,
+        ScMarkStarMail = 406,
-    ScSyncGameMode = 430,
+        ScSyncGameMode = 430,
-    ScRemoveItemNewTags = 440,
+        ScRemoveItemNewTags = 440,
-    ScSyncAllWiki = 470,
+        ScSyncAllWiki = 470,
-    ScSyncAllStat = 500,
+        ScSyncAllStat = 500,
-    ScSyncStat = 501,
+        ScSyncStat = 501,
-    ScNewNoticeNotify = 600,
+        ScNewNoticeNotify = 600,
-    ScCreateOrder = 650,
+        ScCreateOrder = 650,
-    ScOrderMsg = 651,
+        ScOrderMsg = 651,
-    ScFriendBegin = 700,
+        ScFriendBegin = 700,
-    ScFriendRequestSubmit = 701,
+        ScFriendRequestSubmit = 701,
-    ScFriendRequestReject = 702,
+        ScFriendRequestReject = 702,
-    ScFriendRequestAccept = 703,
+        ScFriendRequestAccept = 703,
-    ScFriendDelete = 704,
+        ScFriendDelete = 704,
-    ScFriendSearchName = 705,
+        ScFriendSearchName = 705,
-    ScFriendRequestListSync = 706,
+        ScFriendRequestListSync = 706,
-    ScFriendListSync = 707,
+        ScFriendListSync = 707,
-    ScFriendRequestAddNotify = 708,
+        ScFriendRequestAddNotify = 708,
-    ScFriendAddNotify = 709,
+        ScFriendAddNotify = 709,
-    ScFriendEnd = 750,
+        ScFriendEnd = 750,
-    ScUpdateGameVar = 901,
+        ScUpdateGameVar = 901,
-    ScSyncAllGameVar = 902,//
+        ScSyncAllGameVar = 902,//
-    ScUpdateMiniGame = 913,
+        ScUpdateMiniGame = 913,
-    ScSyncAllMiniGame = 914,//
+        ScSyncAllMiniGame = 914,//
-    ScCompleteMiniGame = 915,
+        ScCompleteMiniGame = 915,
-    ScRpgDungeonBegin = 950,
+        ScRpgDungeonBegin = 950,
-    ScRpgDungeonBuy = 951,
+        ScRpgDungeonBuy = 951,
-    ScRpgDungeonSell = 952,
+        ScRpgDungeonSell = 952,
-    ScRpgDungeonEquipPuton = 953,
+        ScRpgDungeonEquipPuton = 953,
-    ScRpgDungeonEquipPutoff = 954,
+        ScRpgDungeonEquipPutoff = 954,
-    ScSyncRpgEquipColumn = 955,
+        ScSyncRpgEquipColumn = 955,
-    ScSyncRpgDungeonBuffList = 956,
+        ScSyncRpgDungeonBuffList = 956,
-    ScSyncRpgTeamLevel = 957,
+        ScSyncRpgTeamLevel = 957,
-    ScSyncRpgLevelUp = 958,
+        ScSyncRpgLevelUp = 958,
-    ScRpgDungeonPickLvAbility = 959,
+        ScRpgDungeonPickLvAbility = 959,
-    ScSyncRpgDungeonTimeInfo = 960,
+        ScSyncRpgDungeonTimeInfo = 960,
-    ScSyncRpgDungeonAbility = 961,
+        ScSyncRpgDungeonAbility = 961,
-    ScRpgDungeonEnd = 999,
+        ScRpgDungeonEnd = 999,
-    ScItemBagCommonSync = 1000,//
+        ScItemBagCommonSync = 1000,//
-    ScItemBagCommonModify = 1001,
+        ScItemBagCommonModify = 1001,
-    ScItemBagScopeSync = 1002,//
+        ScItemBagScopeSync = 1002,//
-    ScItemBagScopeModify = 1003,
+        ScItemBagScopeModify = 1003,
-    ScItemBagUseItem = 1004,
+        ScItemBagUseItem = 1004,
-    ScItemBagSetQuickBar = 1005,
+        ScItemBagSetQuickBar = 1005,
-    ScItemBagSetQuickBarPos = 1006,
+        ScItemBagSetQuickBarPos = 1006,
-    ScItemBagSetItemLock = 1007,
+        ScItemBagSetItemLock = 1007,
-    ScItemBagAbandonInBag = 1008,
+        ScItemBagAbandonInBag = 1008,
-    ScItemBagBagToFactoryDepot = 1009,
+        ScItemBagBagToFactoryDepot = 1009,
-    ScItemBagTakeoutLostAndFound = 1031,
+        ScItemBagTakeoutLostAndFound = 1031,
-    ScItemBagGotItemToast = 1032,
+        ScItemBagGotItemToast = 1032,
-    ScItemBagTrialCharDepotModify = 1033,
+        ScItemBagTrialCharDepotModify = 1033,
-    ScItemBagTrialCharDepotClear = 1034,
+        ScItemBagTrialCharDepotClear = 1034,
-    ScItemBagUseItemCase = 1035,
+        ScItemBagUseItemCase = 1035,
-    ScItemBagChgSpaceshipChapter = 1036,
+        ScItemBagChgSpaceshipChapter = 1036,
-    ScItemBagEnd = 1049,
+        ScItemBagEnd = 1049,
-    ScAddBuff = 1100,
+        ScAddBuff = 1100,
-    ScRemoveBuff = 1101,
+        ScRemoveBuff = 1101,
-    ScTriggerBuff = 1102,
+        ScTriggerBuff = 1102,
-    ScClearBuffs = 1103,
+        ScClearBuffs = 1103,
-    ScCastSkill = 1160,
+        ScCastSkill = 1160,
-    ScSyncHp = 1161,
+        ScSyncHp = 1161,
-    ScSyncPoise = 1162,
+        ScSyncPoise = 1162,
-    ScSyncUltimateSpCellCnt = 1163,
+        ScSyncUltimateSpCellCnt = 1163,
-    ScSpawnEnemy = 1170,
+        ScSpawnEnemy = 1170,
-    ScSpawnSummon = 1171,
+        ScSpawnSummon = 1171,
-    ScEntityPropertyChange = 1172,
+        ScEntityPropertyChange = 1172,
-    ScBattleDebugInfo = 1173,
+        ScBattleDebugInfo = 1173,
-    ScBattleGenerationChange = 1174,
+        ScBattleGenerationChange = 1174,
-    ScAttachServerSkill = 1175,
+        ScAttachServerSkill = 1175,
-    ScDetachServerSkill = 1176,
+        ScDetachServerSkill = 1176,
-    ScAddServerBuff = 1177,
+        ScAddServerBuff = 1177,
-    ScRemoveServerBuff = 1178,
+        ScRemoveServerBuff = 1178,
-    ScSpaceshipSync = 1200,//
+        ScSpaceshipSync = 1200,//
-    ScSpaceshipModifyRoom = 1201,
+        ScSpaceshipModifyRoom = 1201,
-    ScSpaceshipModifyChar = 1202,
+        ScSpaceshipModifyChar = 1202,
-    ScSpaceshipPresentCharInfo = 1203,
+        ScSpaceshipPresentCharInfo = 1203,
-    ScSpaceshipCharFavorabilityChange = 1204,
+        ScSpaceshipCharFavorabilityChange = 1204,
-    ScSpaceshipRecvGiftFromChar = 1205,
+        ScSpaceshipRecvGiftFromChar = 1205,
-    ScSpaceshipPresentGiftToChar = 1206,
+        ScSpaceshipPresentGiftToChar = 1206,
-    ScSpaceshipSyncRoomLevelUp = 1207,
+        ScSpaceshipSyncRoomLevelUp = 1207,
-    ScSpaceshipSyncCharSkill = 1208,
+        ScSpaceshipSyncCharSkill = 1208,
-    ScSpaceshipSyncRoomStation = 1209,
+        ScSpaceshipSyncRoomStation = 1209,
-    ScSpaceshipManufacturingStationSync = 1210,
+        ScSpaceshipManufacturingStationSync = 1210,
-    ScSpaceshipManufacturingStationStart = 1211,
+        ScSpaceshipManufacturingStationStart = 1211,
-    ScSpaceshipManufacturingStationCancel = 1212,
+        ScSpaceshipManufacturingStationCancel = 1212,
-    ScSpaceshipManufacturingStationCollect = 1213,
+        ScSpaceshipManufacturingStationCollect = 1213,
-    ScSpaceshipModifyGrowCabin = 1214,
+        ScSpaceshipModifyGrowCabin = 1214,
-    ScSpaceshipGrowCabinBreed = 1215,
+        ScSpaceshipGrowCabinBreed = 1215,
-    ScSpaceshipGrowCabinSow = 1216,
+        ScSpaceshipGrowCabinSow = 1216,
-    ScSpaceshipGrowCabinHarvest = 1217,
+        ScSpaceshipGrowCabinHarvest = 1217,
-    ScSpaceshipGrowCabinCancel = 1218,
+        ScSpaceshipGrowCabinCancel = 1218,
-    ScSpaceshipReportCharWorkModify = 1219,
+        ScSpaceshipReportCharWorkModify = 1219,
-    ScSpaceshipReportOutputModify = 1220,
+        ScSpaceshipReportOutputModify = 1220,
-    ScGameMechanicsBegin = 1250,
+        ScGameMechanicsBegin = 1250,
-    ScGameMechanicsSync = 1251,//
+        ScGameMechanicsSync = 1251,//
-    ScGameMechanicsSyncUnlockCondition = 1252,
+        ScGameMechanicsSyncUnlockCondition = 1252,
-    ScGameMechanicsModifyRecords = 1253,
+        ScGameMechanicsModifyRecords = 1253,
-    ScGameMechanicsSyncChallengeStart = 1254,
+        ScGameMechanicsSyncChallengeStart = 1254,
-    ScGameMechanicsSyncChallengeComplete = 1255,
+        ScGameMechanicsSyncChallengeComplete = 1255,
-    ScGameMechanicsSyncCompletionReward = 1256,
+        ScGameMechanicsSyncCompletionReward = 1256,
-    ScGameMechanicsSyncEnterGameInst = 1257,
+        ScGameMechanicsSyncEnterGameInst = 1257,
-    ScGameMechanicsSyncLeaveGameInst = 1258,
+        ScGameMechanicsSyncLeaveGameInst = 1258,
-    ScGameMechanicsSyncRestartGameInst = 1259,
+        ScGameMechanicsSyncRestartGameInst = 1259,
-    ScGameMechanicsModifyInstTimeFreeze = 1260,
+        ScGameMechanicsModifyInstTimeFreeze = 1260,
-    ScGameMechanicsEnd = 1299,
+        ScGameMechanicsEnd = 1299,
-    ScSnsBegin = 1300,
+        ScSnsBegin = 1300,
-    ScSnsGetMomentList = 1301,
+        ScSnsGetMomentList = 1301,
-    ScSnsGetChatList = 1302,
+        ScSnsGetChatList = 1302,
-    ScSyncSnsAddDialog = 1303,
+        ScSyncSnsAddDialog = 1303,
-    ScSnsMomentOption = 1304,
+        ScSnsMomentOption = 1304,
-    ScSyncSnsDialogModify = 1305,
+        ScSyncSnsDialogModify = 1305,
-    ScSyncSnsAddMoment = 1306,
+        ScSyncSnsAddMoment = 1306,
-    ScSnsMomentRead = 1307,
+        ScSnsMomentRead = 1307,
-    ScSnsReadDialog = 1308,
+        ScSnsReadDialog = 1308,
-    ScSyncSnsChatModify = 1309,
+        ScSyncSnsChatModify = 1309,
-    ScSnsEnd = 1330,
+        ScSnsEnd = 1330,
-    ScSettlementBegin = 1331,
+        ScSettlementBegin = 1331,
-    ScSettlementSyncAll = 1332,//
+        ScSettlementSyncAll = 1332,//
-    ScSettlementSyncModify = 1333,
+        ScSettlementSyncModify = 1333,
-    ScSettlementFinishRequires = 1334,
+        ScSettlementFinishRequires = 1334,
-    ScSettlementSetOfficer = 1335,
+        ScSettlementSetOfficer = 1335,
-    ScSettlementSelectRequire = 1336,
+        ScSettlementSelectRequire = 1336,
-    ScSettlementSetSubmitMode = 1337,
+        ScSettlementSetSubmitMode = 1337,
-    ScSettlementEnd = 1350,
+        ScSettlementEnd = 1350,
-    ScShopBegin = 1351,
+        ScShopBegin = 1351,
-    ScShopSync = 1352,//
+        ScShopSync = 1352,//
-    ScShopSyncShopGroupCondition = 1353,
+        ScShopSyncShopGroupCondition = 1353,
-    ScShopModifyShop = 1354,
+        ScShopModifyShop = 1354,
-    ScShopSyncShopCondition = 1355,
+        ScShopSyncShopCondition = 1355,
-    ScShopSyncGoodsCondition = 1356,
+        ScShopSyncGoodsCondition = 1356,
-    ScShopModifyFrequencyLimit = 1357,
+        ScShopModifyFrequencyLimit = 1357,
-    ScShopDeleteFrequencyLimit = 1358,
+        ScShopDeleteFrequencyLimit = 1358,
-    ScShopBuyResp = 1359,
+        ScShopBuyResp = 1359,
-    ScShopSwapMoney = 1360,
+        ScShopSwapMoney = 1360,
-    ScShopEnd = 1370,
+        ScShopEnd = 1370,
-    ScTdBegin = 1371,
+        ScTdBegin = 1371,
-    ScTdGetTdList = 1372,
+        ScTdGetTdList = 1372,
-    ScTdStart = 1373,
+        ScTdStart = 1373,
-    ScTdLeave = 1374,
+        ScTdLeave = 1374,
-    ScSyncTdSettlement = 1375,
+        ScSyncTdSettlement = 1375,
-    ScSyncTdFullStatus = 1376,
+        ScSyncTdFullStatus = 1376,
-    ScSyncTdDropItem = 1378,
+        ScSyncTdDropItem = 1378,
-    ScTdPickDropItem = 1379,
+        ScTdPickDropItem = 1379,
-    ScTdBuyBuilding = 1380,
+        ScTdBuyBuilding = 1380,
-    ScTdEnd = 1400,
+        ScTdEnd = 1400,
-    ScAdventureBegin = 1401,
+        ScAdventureBegin = 1401,
-    ScAdventureLevelModify = 1402,
+        ScAdventureLevelModify = 1402,
-    ScAdventureSyncAll = 1403,//
+        ScAdventureSyncAll = 1403,//
-    ScAdventureEnd = 1430,
+        ScAdventureEnd = 1430,
-    ScGemRecast = 1431,
+        ScGemRecast = 1431,
-    ScGemEnd = 1440,
+        ScGemEnd = 1440,
-    ScResetDailyAdventureTask = 1441,
+        ScResetDailyAdventureTask = 1441,
-    ScDailyActivationModify = 1443,
+        ScDailyActivationModify = 1443,
-    ScAdventureTaskModify = 1444,
+        ScAdventureTaskModify = 1444,
-    ScAdventureBookSync = 1445,//
+        ScAdventureBookSync = 1445,//
-    ScAdventureBookStageModify = 1447,
+        ScAdventureBookStageModify = 1447,
-    ScTalentBegin = 1490,
+        ScTalentBegin = 1490,
-    ScCharUnlockTalentNode = 1491,
+        ScCharUnlockTalentNode = 1491,
-    ScTalentEnd = 1529,
+        ScTalentEnd = 1529,
-    ScRacingDungeonBegin = 1530,
+        ScRacingDungeonBegin = 1530,
-    ScSyncRacingDungeonPassedLevel = 1531,
+        ScSyncRacingDungeonPassedLevel = 1531,
-    ScRacingDungeonEnter = 1532,
+        ScRacingDungeonEnter = 1532,
-    ScSyncRacingDungeonSettlement = 1533,
+        ScSyncRacingDungeonSettlement = 1533,
-    ScSyncRacingDungeonReconnect = 1534,
+        ScSyncRacingDungeonReconnect = 1534,
-    ScRacingDungeonBattlePassReceiveReward = 1535,
+        ScRacingDungeonBattlePassReceiveReward = 1535,
-    ScRacingDungeonGetBattlePass = 1536,
+        ScRacingDungeonGetBattlePass = 1536,
-    ScRacingDungeonGetAchievement = 1537,
+        ScRacingDungeonGetAchievement = 1537,
-    ScRacingDungeonAchievementReceiveReward = 1538,
+        ScRacingDungeonAchievementReceiveReward = 1538,
-    ScSyncRacingDungeonBuffModify = 1539,
+        ScSyncRacingDungeonBuffModify = 1539,
-    ScSyncRacingDungeonAchievementModify = 1540,
+        ScSyncRacingDungeonAchievementModify = 1540,
-    ScSyncRacingTimerPause = 1541,
+        ScSyncRacingTimerPause = 1541,
-    ScSyncRacingDungeonCompleteRoom = 1542,
+        ScSyncRacingDungeonCompleteRoom = 1542,
-    ScSyncRacingDungeonCountdownEvent = 1543,
+        ScSyncRacingDungeonCountdownEvent = 1543,
-    ScRacingDungeonEnd = 1600,
+        ScRacingDungeonEnd = 1600,
-    ScCharBagSetTempTeam = 1601,
+        ScCharBagSetTempTeam = 1601,
-    ScCharBagRemoveTrialCharacter = 1602,
+        ScCharBagRemoveTrialCharacter = 1602,
-    ScTrialCharacterEquipMedicineModify = 1603,
+        ScTrialCharacterEquipMedicineModify = 1603,
-    ScGachaBegin = 1610,
+        ScGachaBegin = 1610,
-    ScGachaSync = 1611,//
+        ScGachaSync = 1611,//
-    ScGachaModifyPoolInfo = 1612,
+        ScGachaModifyPoolInfo = 1612,
-    ScGachaSyncPullResult = 1613,
+        ScGachaSyncPullResult = 1613,
-    ScGachaModifyPoolRoleData = 1614,
+        ScGachaModifyPoolRoleData = 1614,
-    ScGachaEnd = 1640,
+        ScGachaEnd = 1640,
-    ScGameTimeFreezeBegin = 1641,
+        ScGameTimeFreezeBegin = 1641,
-    ScGameTimeFreezeStartRsp = 1642,
+        ScGameTimeFreezeStartRsp = 1642,
-    ScGameTimeFreezeEndRsp = 1643,
+        ScGameTimeFreezeEndRsp = 1643,
-    ScGameTimeFreezeEnd = 1650,
+        ScGameTimeFreezeEnd = 1650,
-    ScActivityBegin = 1651,
+        ScActivityBegin = 1651,
-    ScActivitySync = 1652,//
+        ScActivitySync = 1652,//
-    ScActivityModify = 1653,
+        ScActivityModify = 1653,
-    ScDailyCheckin = 1661,
+        ScDailyCheckin = 1661,
-    ScActivityEnd = 1690,
+        ScActivityEnd = 1690,
-    ScMessageEnd = 4095,
+        ScMessageEnd = 4095,
-}
+    }
 }
--- a/Campofinale/Commands/BaseCommands.cs
+++ b/Campofinale/Commands/BaseCommands.cs
@@ -1,15 +1,4 @@
-using Campofinale.Database;
+namespace Campofinale.Commands
 using Campofinale.Game.Entities;
 using Campofinale.Protocol;
 using Campofinale.Resource;
 using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 using static Campofinale.Resource.ResourceManager;
 namespace Campofinale.Commands
 {
    public static class BaseCommands
    {
--- a/Campofinale/Commands/CommandManager.cs
+++ b/Campofinale/Commands/CommandManager.cs
@@ -1,15 +1,10 @@
 namespace Campofinale.Commands
 {
    using Pastel;
    using System;
    using System.Collections.Generic;
    using System.Drawing;
    using System.Collections.Immutable;
    using System.Linq.Expressions;
    using System.Reflection;
    using System.Net.Sockets;
    using Campofinale.Protocol;
    using Campofinale.Network;
    public static class CommandManager
    {
--- a/Campofinale/Commands/Handlers/CommandAccount.cs
+++ b/Campofinale/Commands/Handlers/CommandAccount.cs
@@ -1,9 +1,4 @@
 using Campofinale.Database;
 using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 namespace Campofinale.Commands.Handlers
 {
--- a/Campofinale/Commands/Handlers/CommandAdd.cs
+++ b/Campofinale/Commands/Handlers/CommandAdd.cs
@@ -1,8 +1,3 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 using Campofinale.Game.Character;
 using Campofinale.Game.Inventory;
 using Campofinale.Packets.Sc;
--- a/Campofinale/Commands/Handlers/CommandCharInfo.cs
+++ b/Campofinale/Commands/Handlers/CommandCharInfo.cs
@@ -1,11 +1,4 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 using MongoDB.Bson;
 using static Campofinale.Resource.ResourceManager;
 using Newtonsoft.Json;
 using Campofinale.Game.Character;
 using Campofinale.Database;
 using Campofinale.Game.Inventory;
--- a/Campofinale/Commands/Handlers/CommandClear.cs
+++ b/Campofinale/Commands/Handlers/CommandClear.cs
@@ -1,10 +1,4 @@
-using System;
+namespace Campofinale.Commands.Handlers
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 namespace Campofinale.Commands.Handlers
 {
    public static class CommandClear
    {
--- a/Campofinale/Commands/Handlers/CommandHeal.cs
+++ b/Campofinale/Commands/Handlers/CommandHeal.cs
@@ -1,12 +1,6 @@
-using Campofinale.Game.Entities;
+using Campofinale.Packets.Sc;
 using Campofinale.Packets.Sc;
 using Campofinale.Protocol;
 using Campofinale.Resource;
 using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 namespace Campofinale.Commands.Handlers
 {
--- a/Campofinale/Commands/Handlers/CommandHelp.cs
+++ b/Campofinale/Commands/Handlers/CommandHelp.cs
@@ -1,10 +1,4 @@
-using System;
+namespace Campofinale.Commands.Handlers
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 namespace Campofinale.Commands.Handlers
 {
    public static class CommandHelp
    {
--- a/Campofinale/Commands/Handlers/CommandIdList.cs
+++ b/Campofinale/Commands/Handlers/CommandIdList.cs
@@ -1,8 +1,3 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 using static Campofinale.Resource.ResourceManager;
 namespace Campofinale.Commands.Handlers 
--- a/Campofinale/Commands/Handlers/CommandKick.cs
+++ b/Campofinale/Commands/Handlers/CommandKick.cs
@@ -1,9 +1,4 @@
 using Campofinale.Resource;
 using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 namespace Campofinale.Commands.Handlers
 {
--- a/Campofinale/Commands/Handlers/CommandLevel.cs
+++ b/Campofinale/Commands/Handlers/CommandLevel.cs
@@ -1,5 +1,4 @@
 using Campofinale.Commands;
 using Campofinale.Database;
 using Campofinale.Packets.Sc;
 using Campofinale.Resource;
--- a/Campofinale/Commands/Handlers/CommandNickname.cs
+++ b/Campofinale/Commands/Handlers/CommandNickname.cs
@@ -1,8 +1,3 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 using Campofinale.Packets.Sc;
 namespace Campofinale.Commands.Handlers
--- a/Campofinale/Commands/Handlers/CommandPlayers.cs
+++ b/Campofinale/Commands/Handlers/CommandPlayers.cs
@@ -1,10 +1,4 @@
-using System;
+namespace Campofinale.Commands.Handlers
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 namespace Campofinale.Commands.Handlers
 {
    public static class CommandPlayers
    {
--- a/Campofinale/Commands/Handlers/CommandRemove.cs
+++ b/Campofinale/Commands/Handlers/CommandRemove.cs
@@ -1,8 +1,3 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 using Campofinale.Database;
 using Campofinale.Game.Character;
 using Campofinale.Packets.Sc;
--- a/Campofinale/Commands/Handlers/CommandSpawn.cs
+++ b/Campofinale/Commands/Handlers/CommandSpawn.cs
@@ -1,10 +1,5 @@
 using Campofinale.Game.Entities;
 using Campofinale.Resource;
 using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 namespace Campofinale.Commands.Handlers
 {
--- a/Campofinale/Commands/Handlers/CommandTeleport.cs
+++ b/Campofinale/Commands/Handlers/CommandTeleport.cs
@@ -1,8 +1,3 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 using static Campofinale.Resource.ResourceManager;
 using Campofinale.Packets.Sc;
 using MongoDB.Bson;
--- a/Campofinale/Commands/Handlers/CommandUnlockAll.cs
+++ b/Campofinale/Commands/Handlers/CommandUnlockAll.cs
@@ -1,12 +1,6 @@
-using Campofinale.Database;
+using Campofinale.Packets.Sc;
 using Campofinale.Packets.Sc;
 using Campofinale.Protocol;
 using Campofinale.Resource;
 using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 namespace Campofinale.Commands.Handlers
 {
--- a/Campofinale/ConfigFile.cs
+++ b/Campofinale/ConfigFile.cs
@@ -1,11 +1,4 @@
-using Newtonsoft.Json;
+namespace Campofinale
 using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 namespace Campofinale
 {
    public class ConfigFile
    {
--- a/Campofinale/Crypto/CSChaCha20.cs
+++ b/Campofinale/Crypto/CSChaCha20.cs
@@ -15,9 +15,6 @@
 * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */
 using System;
 using System.IO;
 using System.Threading.Tasks;
 using System.Runtime.Intrinsics;
 using System.Runtime.CompilerServices;
--- a/Campofinale/Database/Database.cs
+++ b/Campofinale/Database/Database.cs
@@ -3,19 +3,12 @@ using Campofinale.Game.Character;
 using Campofinale.Game.Gacha;
 using Campofinale.Game.Inventory;
 using Campofinale.Game.Spaceship;
 using Campofinale.Resource;
 using MongoDB.Bson;
 using MongoDB.Bson.Serialization.Attributes;
 using MongoDB.Driver;
 using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Security.Cryptography;
 using System.Text;
 using System.Threading.Tasks;
 using static Campofinale.Player;
 using static Campofinale.Resource.ResourceManager;
 using static SQLite.SQLite3;
 namespace Campofinale.Database
 {
--- a/Campofinale/Database/DatabaseManager.cs
+++ b/Campofinale/Database/DatabaseManager.cs
@@ -1,10 +1,4 @@
-using MongoDB.Bson.Serialization.Serializers;
+using MongoDB.Bson.Serialization;
 using MongoDB.Bson.Serialization;
 using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 using MongoDB.Bson.IO;
 using MongoDB.Bson;
 using System.Reflection;
--- a/Campofinale/Game/BitsetManager.cs
+++ b/Campofinale/Game/BitsetManager.cs
@@ -1,9 +1,4 @@
 using Campofinale.Resource;
 using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 using static Campofinale.Resource.ResourceManager;
 namespace Campofinale.Game
--- a/Campofinale/Game/Character/Character.cs
+++ b/Campofinale/Game/Character/Character.cs
@@ -6,13 +6,6 @@ using Google.Protobuf.Collections;
 using MongoDB.Bson;
 using MongoDB.Bson.Serialization.Attributes;
 using MongoDB.Bson.Serialization.IdGenerators;
 using MongoDB.Driver;
 using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Security.Cryptography;
 using System.Text;
 using System.Threading.Tasks;
 using static Campofinale.Resource.ResourceManager;
 using static Campofinale.Resource.ResourceManager.CharGrowthTable;
 using static Campofinale.Resource.ResourceManager.WeaponUpgradeTemplateTable;
--- a/Campofinale/Game/Dungeons/Dungeon.cs
+++ b/Campofinale/Game/Dungeons/Dungeon.cs
@@ -1,9 +1,4 @@
-using System;
+using static Campofinale.Resource.ResourceManager;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 using static Campofinale.Resource.ResourceManager;
 namespace Campofinale.Game.Dungeons
 {
--- a/Campofinale/Game/Entities/Entity.cs
+++ b/Campofinale/Game/Entities/Entity.cs
@@ -1,9 +1,4 @@
 using Campofinale.Resource;
 using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 using static Campofinale.Resource.ResourceManager;
 using static Campofinale.Resource.ResourceManager.LevelScene.LevelData;
--- a/Campofinale/Game/Entities/EntityCharacter.cs
+++ b/Campofinale/Game/Entities/EntityCharacter.cs
@@ -1,10 +1,4 @@
-using Campofinale.Game.Character;
+using Campofinale.Protocol;
 using Campofinale.Protocol;
 using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 using static Campofinale.Resource.ResourceManager;
 namespace Campofinale.Game.Entities
--- a/Campofinale/Game/Entities/EntityInteractive.cs
+++ b/Campofinale/Game/Entities/EntityInteractive.cs
@@ -1,11 +1,6 @@
 using Campofinale.Packets.Sc;
 using Campofinale.Protocol;
 using Campofinale.Resource;
 using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 using static Campofinale.Resource.ResourceManager;
 using static Campofinale.Resource.ResourceManager.LevelScene.LevelData;
--- a/Campofinale/Game/Entities/EntityMonster.cs
+++ b/Campofinale/Game/Entities/EntityMonster.cs
@@ -1,10 +1,5 @@
 using Campofinale.Protocol;
 using Campofinale.Resource;
 using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 using static Campofinale.Resource.ResourceManager;
 namespace Campofinale.Game.Entities
--- a/Campofinale/Game/Entities/EntityNpc.cs
+++ b/Campofinale/Game/Entities/EntityNpc.cs
@@ -1,11 +1,4 @@
-using Campofinale.Protocol;
+using static Campofinale.Resource.ResourceManager;
 using Campofinale.Resource;
 using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 using static Campofinale.Resource.ResourceManager;
 namespace Campofinale.Game.Entities
 {
--- a/Campofinale/Game/Factory/Components/FComponentBusLoader.cs
+++ b/Campofinale/Game/Factory/Components/FComponentBusLoader.cs
@@ -1,9 +1,4 @@
 using Campofinale.Resource;
 using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 using static Campofinale.Game.Factory.FactoryNode;
 namespace Campofinale.Game.Factory.Components
--- a/Campofinale/Game/Factory/Components/FComponentPortManager.cs
+++ b/Campofinale/Game/Factory/Components/FComponentPortManager.cs
@@ -1,9 +1,4 @@
 using Campofinale.Resource;
 using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 using static Campofinale.Game.Factory.FactoryNode;
 namespace Campofinale.Game.Factory.Components
--- a/Campofinale/Game/Factory/Components/FComponentPowerPole.cs
+++ b/Campofinale/Game/Factory/Components/FComponentPowerPole.cs
@@ -1,9 +1,4 @@
 using Campofinale.Resource;
 using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 using static Campofinale.Game.Factory.FactoryNode;
 namespace Campofinale.Game.Factory.Components
--- a/Campofinale/Game/Factory/Components/FComponentPowerSave.cs
+++ b/Campofinale/Game/Factory/Components/FComponentPowerSave.cs
@@ -1,9 +1,4 @@
 using Campofinale.Resource;
 using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 using static Campofinale.Game.Factory.FactoryNode;
 namespace Campofinale.Game.Factory.Components
--- a/Campofinale/Game/Factory/Components/FComponentSelector.cs
+++ b/Campofinale/Game/Factory/Components/FComponentSelector.cs
@@ -1,9 +1,4 @@
 using Campofinale.Resource;
 using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 using static Campofinale.Game.Factory.FactoryNode;
 namespace Campofinale.Game.Factory.Components
--- a/Campofinale/Game/Factory/Components/FComponentStablePower.cs
+++ b/Campofinale/Game/Factory/Components/FComponentStablePower.cs
@@ -1,9 +1,4 @@
 using Campofinale.Resource;
 using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 using static Campofinale.Game.Factory.FactoryNode;
 namespace Campofinale.Game.Factory.Components
--- a/Campofinale/Game/Factory/Components/FComponentSubHub.cs
+++ b/Campofinale/Game/Factory/Components/FComponentSubHub.cs
@@ -1,9 +1,4 @@
 using Campofinale.Resource;
 using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 using static Campofinale.Game.Factory.FactoryNode;
 namespace Campofinale.Game.Factory.Components
--- a/Campofinale/Game/Factory/Components/FComponentTravelPole.cs
+++ b/Campofinale/Game/Factory/Components/FComponentTravelPole.cs
@@ -1,9 +1,4 @@
 using Campofinale.Resource;
 using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 using static Campofinale.Game.Factory.FactoryNode;
 namespace Campofinale.Game.Factory.Components
--- a/Campofinale/Game/Factory/FactoryManager.cs
+++ b/Campofinale/Game/Factory/FactoryManager.cs
@@ -3,12 +3,6 @@ using Campofinale.Packets.Sc;
 using Campofinale.Protocol;
 using Campofinale.Resource;
 using MongoDB.Bson.Serialization.Attributes;
 using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Numerics;
 using System.Text;
 using System.Threading.Tasks;
 using static Campofinale.Resource.ResourceManager;
 namespace Campofinale.Game.Factory
--- a/Campofinale/Game/Gacha/GachaManager.cs
+++ b/Campofinale/Game/Gacha/GachaManager.cs
@@ -1,12 +1,6 @@
 using Campofinale.Database;
 using Campofinale.Protocol;
 using Campofinale.Resource;
 using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Runtime.InteropServices;
 using System.Text;
 using System.Threading.Tasks;
 using static Campofinale.Resource.ResourceManager;
 namespace Campofinale.Game.Gacha
--- a/Campofinale/Game/Gacha/GachaTransaction.cs
+++ b/Campofinale/Game/Gacha/GachaTransaction.cs
@@ -1,10 +1,5 @@
 using MongoDB.Bson.Serialization.Attributes;
 using MongoDB.Bson;
 using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 using MongoDB.Bson.Serialization.IdGenerators;
 namespace Campofinale.Game.Gacha
--- a/Campofinale/Game/GameConstants.cs
+++ b/Campofinale/Game/GameConstants.cs
@@ -1,10 +1,4 @@
-using System;
+namespace Campofinale.Game
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 namespace Campofinale.Game
 {
    public static class GameConstants
    {
--- a/Campofinale/Game/Inventory/InventoryList.cs
+++ b/Campofinale/Game/Inventory/InventoryList.cs
@@ -1,10 +1,5 @@
 using Campofinale.Database;
 using Campofinale.Packets.Sc;
 using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 namespace Campofinale.Game.Inventory
 {
--- a/Campofinale/Game/Inventory/InventoryManager.cs
+++ b/Campofinale/Game/Inventory/InventoryManager.cs
@@ -1,14 +1,6 @@
 using Campofinale.Database;
 using Campofinale.Packets.Sc;
 using Campofinale.Resource;
 using Google.Protobuf.Collections;
 using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Reflection.Metadata;
 using System.Runtime.InteropServices;
 using System.Text;
 using System.Threading.Tasks;
 using static Campofinale.Resource.ResourceManager;
 namespace Campofinale.Game.Inventory
--- a/Campofinale/Game/Mail.cs
+++ b/Campofinale/Game/Mail.cs
@@ -1,11 +1,6 @@
 using Campofinale.Resource;
 using MongoDB.Bson.Serialization.Attributes;
 using MongoDB.Bson;
 using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 using MongoDB.Bson.Serialization.IdGenerators;
 namespace Campofinale.Game
--- a/Campofinale/Game/SceneManager.cs
+++ b/Campofinale/Game/SceneManager.cs
@@ -3,14 +3,7 @@ using Campofinale.Game.Inventory;
 using Campofinale.Packets.Sc;
 using Campofinale.Resource;
 using MongoDB.Bson.Serialization.Attributes;
 using SharpCompress.Common;
 using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Numerics;
 using System.Text;
 using System.Text.Json.Serialization;
 using System.Threading.Tasks;
 using static Campofinale.Resource.ResourceManager;
 using static Campofinale.Resource.ResourceManager.LevelScene.LevelData;
--- a/Campofinale/Game/Spaceship/SpaceshipChar.cs
+++ b/Campofinale/Game/Spaceship/SpaceshipChar.cs
@@ -1,11 +1,5 @@
 using MongoDB.Bson.Serialization.Attributes;
 using MongoDB.Bson;
 using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 using static Campofinale.Resource.ResourceManager;
 using MongoDB.Bson.Serialization.IdGenerators;
 using Campofinale.Resource;
--- a/Campofinale/Game/Spaceship/SpaceshipManager.cs
+++ b/Campofinale/Game/Spaceship/SpaceshipManager.cs
@@ -1,14 +1,4 @@
 using Campofinale.Database;
 using Campofinale.Game.Inventory;
 using MongoDB.Bson.Serialization.Attributes;
 using MongoDB.Bson;
 using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 using MongoDB.Bson.Serialization.IdGenerators;
 using static Campofinale.Resource.ResourceManager;
 using Campofinale.Resource;
 using Campofinale.Resource.Table;
--- a/Campofinale/Game/Spaceship/SpaceshipRoom.cs
+++ b/Campofinale/Game/Spaceship/SpaceshipRoom.cs
@@ -1,10 +1,5 @@
 using MongoDB.Bson.Serialization.Attributes;
 using MongoDB.Bson;
 using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 using static Campofinale.Resource.ResourceManager;
 using Campofinale.Resource;
 using MongoDB.Bson.Serialization.IdGenerators;
--- a/Campofinale/Game/Team.cs
+++ b/Campofinale/Game/Team.cs
@@ -1,10 +1,4 @@
-using System;
+namespace Campofinale.Game
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 namespace Campofinale.Game
 {
    public class Team
    {
--- a/Campofinale/Http/Dispatch.cs
+++ b/Campofinale/Http/Dispatch.cs
@@ -1,18 +1,5 @@
-using Campofinale.Database;
+using Campofinale.Game;
 using Campofinale.Game;
 using Campofinale.Game.Gacha;
 using Google.Protobuf.WellKnownTypes;
 using HttpServerLite;
 using MongoDB.Bson.IO;
 using SQLite;
 using SQLiteNetExtensions.Extensions;
 using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Channels;
 using System.Threading.Tasks;
 using static Campofinale.Game.Gacha.GachaManager;
 namespace Campofinale.Http
 {
--- a/Campofinale/Http/PCDispatch.cs
+++ b/Campofinale/Http/PCDispatch.cs
@@ -1,10 +1,6 @@
 using Campofinale.Commands;
 using Campofinale.Commands.Handlers;
 using Campofinale.Database;
 using HttpServerLite;
 using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
--- a/Campofinale/Http/SDK.cs
+++ b/Campofinale/Http/SDK.cs
@@ -1,11 +1,5 @@
 using Campofinale.Database;
 using Campofinale.Resource;
 using HttpServerLite;
 using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 using static Campofinale.Game.Gacha.GachaManager;
 using static Campofinale.Http.Dispatch;
--- a/Campofinale/Logger.cs
+++ b/Campofinale/Logger.cs
@@ -1,9 +1,5 @@
 using Campofinale;
 using Pastel;
 using System;
 using System.Diagnostics;
 using System.IO;
 using static System.Net.Mime.MediaTypeNames;
 public static class Logger
 {
--- a/Campofinale/Network/Packet.cs
+++ b/Campofinale/Network/Packet.cs
@@ -1,20 +1,9 @@
 using Campofinale.Protocol;
 using Google.Protobuf;
 using Pastel;
 using System;
 using System.Buffers.Binary;
 using System.Collections.Generic;
 using System.Drawing;
 using System.Linq;
 using System.Net;
 using System.Net.Sockets;
 using System.Reflection;
 using System.Runtime.InteropServices;
 using System.Security.Cryptography;
 using System.Text;
 using System.Threading.Tasks;
 using static System.Runtime.InteropServices.JavaScript.JSType;
 namespace Campofinale.Network
 {
--- a/Campofinale/NotifyManager.cs
+++ b/Campofinale/NotifyManager.cs
@@ -7,7 +7,6 @@
    using System.Collections.Immutable;
    using System.Linq.Expressions;
    using System.Reflection;
    using System.Net.Sockets;
    using Campofinale.Protocol;
    using Campofinale.Network;
--- a/Campofinale/Packets/Cs/HandleCsBattleOp.cs
+++ b/Campofinale/Packets/Cs/HandleCsBattleOp.cs
@@ -2,16 +2,6 @@
 using Campofinale.Game.Entities;
 using Campofinale.Network;
 using Campofinale.Protocol;
 using Google.Protobuf;
 using MongoDB.Driver.Core.Clusters;
 using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Net.Sockets;
 using System.Security.Cryptography;
 using System.Text;
 using System.Threading.Tasks;
 using System.Xml.Linq;
 namespace Campofinale.Packets.Cs
 {
--- a/Campofinale/Packets/Cs/HandleCsBitsetAdd.cs
+++ b/Campofinale/Packets/Cs/HandleCsBitsetAdd.cs
@@ -1,17 +1,7 @@
-using Campofinale.Game.Character;
+using Campofinale.Network;
 using Campofinale.Network;
 using Campofinale.Packets.Sc;
 using Campofinale.Protocol;
 using Campofinale.Resource;
 using Google.Protobuf;
 using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Net.Sockets;
 using System.Security.Cryptography;
 using System.Text;
 using System.Threading.Tasks;
 using System.Xml.Linq;
 namespace Campofinale.Packets.Cs
 {
--- a/Campofinale/Packets/Cs/HandleCsBitsetRemove.cs
+++ b/Campofinale/Packets/Cs/HandleCsBitsetRemove.cs
@@ -1,17 +1,7 @@
-using Campofinale.Game.Character;
+using Campofinale.Network;
 using Campofinale.Network;
 using Campofinale.Packets.Sc;
 using Campofinale.Protocol;
 using Campofinale.Resource;
 using Google.Protobuf;
 using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Net.Sockets;
 using System.Security.Cryptography;
 using System.Text;
 using System.Threading.Tasks;
 using System.Xml.Linq;
 namespace Campofinale.Packets.Cs
 {
--- a/Campofinale/Packets/Cs/HandleCsCharBagSetCurrTeamIndex.cs
+++ b/Campofinale/Packets/Cs/HandleCsCharBagSetCurrTeamIndex.cs
@@ -1,21 +1,7 @@
-using BeyondTools.VFS.Crypto;
+using Campofinale.Network;
 using Campofinale.Network;
 using Campofinale.Packets.Sc;
 using Campofinale.Protocol;
 using Campofinale.Resource;
 using Google.Protobuf;
 using Google.Protobuf.WellKnownTypes;
 using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Net.Sockets;
 using System.Security.Cryptography;
 using System.Text;
 using System.Threading.Tasks;
 using System.Xml.Linq;
 using static Campofinale.Resource.ResourceManager;
 using static System.Net.Mime.MediaTypeNames;
 namespace Campofinale.Packets.Cs
 {
--- a/Campofinale/Packets/Cs/HandleCsCharBagSetTeam.cs
+++ b/Campofinale/Packets/Cs/HandleCsCharBagSetTeam.cs
@@ -1,15 +1,6 @@
 using Campofinale.Network;
 using Campofinale.Packets.Sc;
 using Campofinale.Protocol;
 using Google.Protobuf;
 using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Net.Sockets;
 using System.Security.Cryptography;
 using System.Text;
 using System.Threading.Tasks;
 using System.Xml.Linq;
 namespace Campofinale.Packets.Cs
 {
--- a/Campofinale/Packets/Cs/HandleCsCharBagSetTeamLeader.cs
+++ b/Campofinale/Packets/Cs/HandleCsCharBagSetTeamLeader.cs
@@ -1,15 +1,5 @@
 using Campofinale.Network;
 using Campofinale.Packets.Sc;
 using Campofinale.Protocol;
 using Google.Protobuf;
 using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Net.Sockets;
 using System.Security.Cryptography;
 using System.Text;
 using System.Threading.Tasks;
 using System.Xml.Linq;
 namespace Campofinale.Packets.Cs
 {
--- a/Campofinale/Packets/Cs/HandleCsCharBagSetTeamName.cs
+++ b/Campofinale/Packets/Cs/HandleCsCharBagSetTeamName.cs
@@ -1,14 +1,5 @@
 using Campofinale.Network;
 using Campofinale.Protocol;
 using Google.Protobuf;
 using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Net.Sockets;
 using System.Security.Cryptography;
 using System.Text;
 using System.Threading.Tasks;
 using System.Xml.Linq;
 namespace Campofinale.Packets.Cs
 {
--- a/Campofinale/Packets/Cs/HandleCsCharLevelUp.cs
+++ b/Campofinale/Packets/Cs/HandleCsCharLevelUp.cs
@@ -1,15 +1,6 @@
 using Campofinale.Game.Character;
 using Campofinale.Network;
 using Campofinale.Protocol;
 using Google.Protobuf;
 using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Net.Sockets;
 using System.Security.Cryptography;
 using System.Text;
 using System.Threading.Tasks;
 using System.Xml.Linq;
 namespace Campofinale.Packets.Cs
 {
--- a/Campofinale/Packets/Cs/HandleCsCharPotentialUnlock.cs
+++ b/Campofinale/Packets/Cs/HandleCsCharPotentialUnlock.cs
@@ -1,16 +1,6 @@
 using Campofinale.Game.Character;
 using Campofinale.Network;
 using Campofinale.Packets.Sc;
 using Campofinale.Protocol;
 using Google.Protobuf;
 using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Net.Sockets;
 using System.Security.Cryptography;
 using System.Text;
 using System.Threading.Tasks;
 using System.Xml.Linq;
 namespace Campofinale.Packets.Cs
 {
--- a/Campofinale/Packets/Cs/HandleCsCharUnlockTalentNode.cs
+++ b/Campofinale/Packets/Cs/HandleCsCharUnlockTalentNode.cs
@@ -1,16 +1,6 @@
 using Campofinale.Game.Character;
 using Campofinale.Network;
 using Campofinale.Packets.Sc;
 using Campofinale.Protocol;
 using Google.Protobuf;
 using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Net.Sockets;
 using System.Security.Cryptography;
 using System.Text;
 using System.Threading.Tasks;
 using System.Xml.Linq;
 namespace Campofinale.Packets.Cs
 {
--- a/Campofinale/Packets/Cs/HandleCsEnterDungeon.cs
+++ b/Campofinale/Packets/Cs/HandleCsEnterDungeon.cs
@@ -1,14 +1,5 @@
 using Campofinale.Network;
 using Campofinale.Protocol;
 using Google.Protobuf;
 using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Net.Sockets;
 using System.Security.Cryptography;
 using System.Text;
 using System.Threading.Tasks;
 using System.Xml.Linq;
 namespace Campofinale.Packets.Cs
 {
--- a/Campofinale/Packets/Cs/HandleCsEquipPutoff.cs
+++ b/Campofinale/Packets/Cs/HandleCsEquipPutoff.cs
@@ -1,15 +1,6 @@
 using Campofinale.Game.Character;
 using Campofinale.Network;
 using Campofinale.Protocol;
 using Google.Protobuf;
 using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Net.Sockets;
 using System.Security.Cryptography;
 using System.Text;
 using System.Threading.Tasks;
 using System.Xml.Linq;
 namespace Campofinale.Packets.Cs
 {
--- a/Campofinale/Packets/Cs/HandleCsEquipPuton.cs
+++ b/Campofinale/Packets/Cs/HandleCsEquipPuton.cs
@@ -1,15 +1,6 @@
 using Campofinale.Game.Character;
 using Campofinale.Network;
 using Campofinale.Protocol;
 using Google.Protobuf;
 using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Net.Sockets;
 using System.Security.Cryptography;
 using System.Text;
 using System.Threading.Tasks;
 using System.Xml.Linq;
 namespace Campofinale.Packets.Cs
 {
--- a/Campofinale/Packets/Cs/HandleCsFactoryHsFb.cs
+++ b/Campofinale/Packets/Cs/HandleCsFactoryHsFb.cs
@@ -1,14 +1,5 @@
 using Campofinale.Network;
 using Campofinale.Protocol;
 using Google.Protobuf;
 using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Net.Sockets;
 using System.Security.Cryptography;
 using System.Text;
 using System.Threading.Tasks;
 using System.Xml.Linq;
 namespace Campofinale.Packets.Cs
 {
--- a/Campofinale/Packets/Cs/HandleCsFactoryOp.cs
+++ b/Campofinale/Packets/Cs/HandleCsFactoryOp.cs
@@ -1,14 +1,5 @@
 using Campofinale.Network;
 using Campofinale.Protocol;
 using Google.Protobuf;
 using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Net.Sockets;
 using System.Security.Cryptography;
 using System.Text;
 using System.Threading.Tasks;
 using System.Xml.Linq;
 namespace Campofinale.Packets.Cs
 {
--- a/Campofinale/Packets/Cs/HandleCsFactoryStatisticRequire.cs
+++ b/Campofinale/Packets/Cs/HandleCsFactoryStatisticRequire.cs
@@ -1,14 +1,5 @@
 using Campofinale.Network;
 using Campofinale.Protocol;
 using Google.Protobuf;
 using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Net.Sockets;
 using System.Security.Cryptography;
 using System.Text;
 using System.Threading.Tasks;
 using System.Xml.Linq;
 namespace Campofinale.Packets.Cs
 {
--- a/Campofinale/Packets/Cs/HandleCsFinishDialog.cs
+++ b/Campofinale/Packets/Cs/HandleCsFinishDialog.cs
@@ -1,14 +1,5 @@
 using Campofinale.Network;
 using Campofinale.Protocol;
 using Google.Protobuf;
 using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Net.Sockets;
 using System.Security.Cryptography;
 using System.Text;
 using System.Threading.Tasks;
 using System.Xml.Linq;
 namespace Campofinale.Packets.Cs
 {
--- a/Campofinale/Packets/Cs/HandleCsFlushSync.cs
+++ b/Campofinale/Packets/Cs/HandleCsFlushSync.cs
@@ -1,14 +1,5 @@
 using Campofinale.Network;
 using Campofinale.Protocol;
 using Google.Protobuf;
 using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Net.Sockets;
 using System.Security.Cryptography;
 using System.Text;
 using System.Threading.Tasks;
 using System.Xml.Linq;
 namespace Campofinale.Packets.Cs
 {
--- a/Campofinale/Packets/Cs/HandleCsGachaTenPullReq.cs
+++ b/Campofinale/Packets/Cs/HandleCsGachaTenPullReq.cs
@@ -1,17 +1,5 @@
 using Campofinale.Network;
 using Campofinale.Protocol;
 using Campofinale.Resource;
 using Google.Protobuf;
 using Google.Protobuf.WellKnownTypes;
 using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Net.Sockets;
 using System.Security.Cryptography;
 using System.Text;
 using System.Threading.Tasks;
 using System.Xml.Linq;
 using static Campofinale.Resource.ResourceManager;
 namespace Campofinale.Packets.Cs
 {
--- a/Campofinale/Packets/Cs/HandleCsGetMail.cs
+++ b/Campofinale/Packets/Cs/HandleCsGetMail.cs
@@ -2,7 +2,6 @@
 using Campofinale.Packets.Sc;
 using Campofinale.Protocol;
 namespace Campofinale.Packets.Cs
 {
    public class HandleCsGetMail
--- a/Campofinale/Packets/Cs/HandleCsItemBagAbandonInBag.cs
+++ b/Campofinale/Packets/Cs/HandleCsItemBagAbandonInBag.cs
@@ -1,15 +1,5 @@
 using Campofinale.Network;
 using Campofinale.Packets.Sc;
 using Campofinale.Protocol;
 using Google.Protobuf;
 using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Net.Sockets;
 using System.Security.Cryptography;
 using System.Text;
 using System.Threading.Tasks;
 using System.Xml.Linq;
 namespace Campofinale.Packets.Cs
 {
--- a/Campofinale/Packets/Cs/HandleCsItemBagMoveInBag.cs
+++ b/Campofinale/Packets/Cs/HandleCsItemBagMoveInBag.cs
@@ -1,15 +1,5 @@
 using Campofinale.Network;
 using Campofinale.Packets.Sc;
 using Campofinale.Protocol;
 using Google.Protobuf;
 using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Net.Sockets;
 using System.Security.Cryptography;
 using System.Text;
 using System.Threading.Tasks;
 using System.Xml.Linq;
 namespace Campofinale.Packets.Cs
 {
--- a/Campofinale/Packets/Cs/HandleCsLeaveDungeon.cs
+++ b/Campofinale/Packets/Cs/HandleCsLeaveDungeon.cs
@@ -1,14 +1,5 @@
 using Campofinale.Network;
 using Campofinale.Protocol;
 using Google.Protobuf;
 using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Net.Sockets;
 using System.Security.Cryptography;
 using System.Text;
 using System.Threading.Tasks;
 using System.Xml.Linq;
 namespace Campofinale.Packets.Cs
 {
--- a/Campofinale/Packets/Cs/HandleCsLogin.cs
+++ b/Campofinale/Packets/Cs/HandleCsLogin.cs
@@ -7,7 +7,6 @@ using Campofinale.Protocol;
 using Campofinale.Resource;
 using System.Security.Cryptography;
 using static Campofinale.Resource.ResourceManager;
 using System.Reflection;
 namespace Campofinale.Packets.Cs
 {
--- a/Campofinale/Packets/Cs/HandleCsMergeMsg.cs
+++ b/Campofinale/Packets/Cs/HandleCsMergeMsg.cs
@@ -1,14 +1,5 @@
 using Campofinale.Network;
 using Campofinale.Protocol;
 using Google.Protobuf;
 using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Net.Sockets;
 using System.Security.Cryptography;
 using System.Text;
 using System.Threading.Tasks;
 using System.Xml.Linq;
 namespace Campofinale.Packets.Cs
 {
--- a/Campofinale/Packets/Cs/HandleCsMoveObjectMove.cs
+++ b/Campofinale/Packets/Cs/HandleCsMoveObjectMove.cs
@@ -1,15 +1,6 @@
 using Campofinale.Game.Entities;
 using Campofinale.Network;
 using Campofinale.Protocol;
 using Google.Protobuf;
 using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Net.Sockets;
 using System.Security.Cryptography;
 using System.Text;
 using System.Threading.Tasks;
 using System.Xml.Linq;
 using static Campofinale.Resource.ResourceManager;
 namespace Campofinale.Packets.Cs
--- a/Campofinale/Packets/Cs/HandleCsPing.cs
+++ b/Campofinale/Packets/Cs/HandleCsPing.cs
@@ -1,14 +1,5 @@
 using Campofinale.Network;
 using Campofinale.Protocol;
 using Google.Protobuf;
 using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Net.Sockets;
 using System.Security.Cryptography;
 using System.Text;
 using System.Threading.Tasks;
 using System.Xml.Linq;
 namespace Campofinale.Packets.Cs
 {
--- a/Campofinale/Packets/Cs/HandleCsSceneInteractSpInteractive.cs
+++ b/Campofinale/Packets/Cs/HandleCsSceneInteractSpInteractive.cs
@@ -1,18 +1,8 @@
-using Campofinale.Game.Character;
+using Campofinale.Game.Entities;
 using Campofinale.Game.Entities;
 using Campofinale.Network;
 using Campofinale.Packets.Sc;
 using Campofinale.Protocol;
 using Campofinale.Resource;
 using Google.Protobuf;
 using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Net.Sockets;
 using System.Security.Cryptography;
 using System.Text;
 using System.Threading.Tasks;
 using System.Xml.Linq;
 using static Campofinale.Resource.ResourceManager;
 namespace Campofinale.Packets.Cs
--- a/Campofinale/Packets/Cs/HandleCsSceneInteractiveEventTrigger.cs
+++ b/Campofinale/Packets/Cs/HandleCsSceneInteractiveEventTrigger.cs
@@ -1,16 +1,6 @@
-using Campofinale.Game.Character;
+using Campofinale.Game.Entities;
 using Campofinale.Game.Entities;
 using Campofinale.Network;
 using Campofinale.Protocol;
 using Google.Protobuf;
 using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Net.Sockets;
 using System.Security.Cryptography;
 using System.Text;
 using System.Threading.Tasks;
 using System.Xml.Linq;
 namespace Campofinale.Packets.Cs
 {
--- a/Campofinale/Packets/Cs/HandleCsSceneLoadFinish.cs
+++ b/Campofinale/Packets/Cs/HandleCsSceneLoadFinish.cs
@@ -1,21 +1,8 @@
-using BeyondTools.VFS.Crypto;
+using Campofinale.Network;
 using Campofinale.Network;
 using Campofinale.Packets.Sc;
 using Campofinale.Protocol;
 using Campofinale.Resource;
 using Google.Protobuf;
 using Google.Protobuf.WellKnownTypes;
 using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Net.Sockets;
 using System.Security.Cryptography;
 using System.Text;
 using System.Threading.Tasks;
 using System.Xml.Linq;
 using static Campofinale.Resource.ResourceManager;
 using static System.Net.Mime.MediaTypeNames;
 namespace Campofinale.Packets.Cs
 {
--- a/Campofinale/Packets/Cs/HandleCsSceneMoveStateSet.cs
+++ b/Campofinale/Packets/Cs/HandleCsSceneMoveStateSet.cs
@@ -1,14 +1,5 @@
 using Campofinale.Network;
 using Campofinale.Protocol;
 using Google.Protobuf;
 using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Net.Sockets;
 using System.Security.Cryptography;
 using System.Text;
 using System.Threading.Tasks;
 using System.Xml.Linq;
 namespace Campofinale.Packets.Cs
 {
--- a/Campofinale/Packets/Cs/HandleCsSceneRepatriate.cs
+++ b/Campofinale/Packets/Cs/HandleCsSceneRepatriate.cs
@@ -1,5 +1,4 @@
 using Campofinale.Network;
 using Campofinale.Packets.Sc;
 using Campofinale.Protocol;
 namespace Campofinale.Packets.Cs
--- a/Campofinale/Packets/Cs/HandleCsSceneSetLastSafeZone.cs
+++ b/Campofinale/Packets/Cs/HandleCsSceneSetLastSafeZone.cs
@@ -1,16 +1,5 @@
-using Campofinale.Game;
+using Campofinale.Network;
 using Campofinale.Network;
 using Campofinale.Protocol;
 using Google.Protobuf;
 using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Net.Sockets;
 using System.Security.Cryptography;
 using System.Text;
 using System.Threading.Tasks;
 using System.Xml.Linq;
 using static Campofinale.Resource.ResourceManager;
 namespace Campofinale.Packets.Cs
 {
--- a/Campofinale/Packets/Cs/HandleCsSceneSetSafeZone.cs
+++ b/Campofinale/Packets/Cs/HandleCsSceneSetSafeZone.cs
@@ -1,16 +1,6 @@
-using Campofinale.Game;
+using Campofinale.Game.Entities;
 using Campofinale.Game.Entities;
 using Campofinale.Network;
 using Campofinale.Protocol;
 using Google.Protobuf;
 using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Net.Sockets;
 using System.Security.Cryptography;
 using System.Text;
 using System.Threading.Tasks;
 using System.Xml.Linq;
 using static Campofinale.Resource.ResourceManager;
 namespace Campofinale.Packets.Cs
--- a/Campofinale/Packets/Cs/HandleCsSceneSetTrackPoint.cs
+++ b/Campofinale/Packets/Cs/HandleCsSceneSetTrackPoint.cs
@@ -1,15 +1,6 @@
 using Campofinale.Network;
 using Campofinale.Packets.Sc;
 using Campofinale.Protocol;
 using Google.Protobuf;
 using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Net.Sockets;
 using System.Security.Cryptography;
 using System.Text;
 using System.Threading.Tasks;
 using System.Xml.Linq;
 namespace Campofinale.Packets.Cs
 {
--- a/Campofinale/Packets/Cs/HandleCsSceneTeleport.cs
+++ b/Campofinale/Packets/Cs/HandleCsSceneTeleport.cs
@@ -1,14 +1,5 @@
 using Campofinale.Network;
 using Campofinale.Protocol;
 using Google.Protobuf;
 using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Net.Sockets;
 using System.Security.Cryptography;
 using System.Text;
 using System.Threading.Tasks;
 using System.Xml.Linq;
 namespace Campofinale.Packets.Cs
 {
--- a/Campofinale/Packets/Cs/HandleCsSpaceshipPresentGiftToChar.cs
+++ b/Campofinale/Packets/Cs/HandleCsSpaceshipPresentGiftToChar.cs
@@ -1,15 +1,5 @@
 using Campofinale.Network;
 using Campofinale.Packets.Sc;
 using Campofinale.Protocol;
 using Google.Protobuf;
 using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Net.Sockets;
 using System.Security.Cryptography;
 using System.Text;
 using System.Threading.Tasks;
 using System.Xml.Linq;
 namespace Campofinale.Packets.Cs
 {
--- a/Campofinale/Packets/Cs/HandleCsSpaceshipStationChar.cs
+++ b/Campofinale/Packets/Cs/HandleCsSpaceshipStationChar.cs
@@ -1,15 +1,6 @@
 using Campofinale.Network;
 using Campofinale.Packets.Sc;
 using Campofinale.Protocol;
 using Google.Protobuf;
 using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Net.Sockets;
 using System.Security.Cryptography;
 using System.Text;
 using System.Threading.Tasks;
 using System.Xml.Linq;
 namespace Campofinale.Packets.Cs
 {
--- a/Campofinale/Packets/Cs/HandleCsSpaceshipStationCharChangeWorkState.cs
+++ b/Campofinale/Packets/Cs/HandleCsSpaceshipStationCharChangeWorkState.cs
@@ -1,15 +1,6 @@
 using Campofinale.Network;
 using Campofinale.Packets.Sc;
 using Campofinale.Protocol;
 using Google.Protobuf;
 using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Net.Sockets;
 using System.Security.Cryptography;
 using System.Text;
 using System.Threading.Tasks;
 using System.Xml.Linq;
 namespace Campofinale.Packets.Cs
 {
--- a/Campofinale/Packets/Cs/HandleCsUpdateQuestObjective.cs
+++ b/Campofinale/Packets/Cs/HandleCsUpdateQuestObjective.cs
@@ -1,14 +1,5 @@
 using Campofinale.Network;
 using Campofinale.Protocol;
 using Google.Protobuf;
 using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Net.Sockets;
 using System.Security.Cryptography;
 using System.Text;
 using System.Threading.Tasks;
 using System.Xml.Linq;
 namespace Campofinale.Packets.Cs
 {
--- a/Campofinale/Packets/Cs/HandleCsWeaponAddExp.cs
+++ b/Campofinale/Packets/Cs/HandleCsWeaponAddExp.cs
@@ -1,16 +1,6 @@
-using Campofinale.Game.Character;
+using Campofinale.Game.Inventory;
 using Campofinale.Game.Inventory;
 using Campofinale.Network;
 using Campofinale.Protocol;
 using Google.Protobuf;
 using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Net.Sockets;
 using System.Security.Cryptography;
 using System.Text;
 using System.Threading.Tasks;
 using System.Xml.Linq;
 namespace Campofinale.Packets.Cs
 {
--- a/Campofinale/Packets/Cs/HandleCsWeaponPuton.cs
+++ b/Campofinale/Packets/Cs/HandleCsWeaponPuton.cs
@@ -1,15 +1,6 @@
 using Campofinale.Game.Character;
 using Campofinale.Network;
 using Campofinale.Protocol;
 using Google.Protobuf;
 using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Net.Sockets;
 using System.Security.Cryptography;
 using System.Text;
 using System.Threading.Tasks;
 using System.Xml.Linq;
 namespace Campofinale.Packets.Cs
 {
--- a/Campofinale/Packets/Sc/PacketScActivitySync.cs
+++ b/Campofinale/Packets/Sc/PacketScActivitySync.cs
@@ -1,11 +1,5 @@
 using Campofinale.Network;
 using Campofinale.Protocol;
 using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Security.Cryptography;
 using System.Text;
 using System.Threading.Tasks;
 namespace Campofinale.Packets.Sc
 {
--- a/Show More
+++ b/Show More