【优化】游戏服调整为多进程，同步GameServer目录

Config/GenFromExcel/s/StartConfig/Benchmark/StartMachineConfigCategory.bytes

@@ -1,2 +1,2 @@
 
-
	127.0.0.1	127.0.0.1"10000
+'

192.168.0.102
192.168.0.102"10000

Config/GenFromExcel/s/StartConfig/Benchmark/StartProcessConfigCategory.bytes

@@ -1,4 +1,2 @@
 
-

�

-
�

-
�

+

�

Config/GenFromExcel/s/StartConfig/Benchmark/StartSceneConfigCategory.bytes

@@ -1,4 +1,3 @@
 
 ,


"BenchmarkServer*BenchmarkServer0±ê

--
"BenchmarkClient*BenchmarkClient10²ê

--
"BenchmarkClient*BenchmarkClient20³ê

+-

"BenchmarkClient*BenchmarkClient10²ê

Config/GenFromExcel/s/StartConfig/Benchmark/StartZoneConfigCategory.bytes

@@ -1,2 +1,3 @@
 
-
mongodb://127.0.0.1ET1
+)
mongodb://127.0.0.1:27017
+StarEscort

Config/GenFromExcel/s/StartConfig/Localhost/StartProcessConfigCategory.bytes

@@ -1,2 +1,5 @@
 
-

�

+

�

+
�

+
�

+
�

Config/GenFromExcel/s/StartConfig/Localhost/StartSceneConfigCategory.bytes

@@ -1,6 +1,5 @@
 
-


"Realm*Realm0²ê

-‘N

"Game*Game10³ê

-È

"Robot*Robot01
+

"Realm*Realm0²ê

+‘N
"Game*Game10³ê

 )¬
"
RouterManager*
RouterManager0Üì

-­
"Router*Router010Ýì

+­"Router*Router010Ýì

Config/GenFromExcel/s/StartConfig/Release/StartProcessConfigCategory.bytes

@@ -1,2 +1,5 @@
 
-

�

+

�

+
�

+
�

+
�

Config/GenFromExcel/s/StartConfig/Release/StartSceneConfigCategory.bytes

@@ -1,5 +1,5 @@
 
-


"Realm*Realm0²ê

-‘N

"Game*Game10³ê

+

"Realm*Realm0²ê

+‘N
"Game*Game10³ê

 )¬
"
RouterManager*
RouterManager0Üì

-­
"Router*Router010íº
+­"Router*Router010íº

Config/GenJson/s/StartConfig/Benchmark/StartMachineConfig.txt

@@ -1,3 +1,3 @@
 {"list":[
-{"_t":"StartMachineConfig","_id":1,"InnerIP":"127.0.0.1","OuterIP":"127.0.0.1","WatcherPort":"10000"},
+{"_t":"StartMachineConfig","_id":1,"InnerIP":"192.168.0.102","OuterIP":"192.168.0.102","WatcherPort":"10000"},
 ]}

Config/GenJson/s/StartConfig/Benchmark/StartProcessConfig.txt

@@ -1,5 +1,3 @@
 {"list":[
 {"_t":"StartProcessConfig","_id":1,"MachineId":1,"InnerPort":20101},
-{"_t":"StartProcessConfig","_id":2,"MachineId":1,"InnerPort":20102},
-{"_t":"StartProcessConfig","_id":3,"MachineId":1,"InnerPort":20103},
 ]}

Config/GenJson/s/StartConfig/Benchmark/StartSceneConfig.txt

@@ -1,5 +1,4 @@
 {"list":[
 {"_t":"StartSceneConfig","_id":1,"Process":1,"Zone":1,"SceneType":"BenchmarkServer","Name":"BenchmarkServer","OuterPort":30001},
-{"_t":"StartSceneConfig","_id":2,"Process":2,"Zone":1,"SceneType":"BenchmarkClient","Name":"BenchmarkClient1","OuterPort":30002},
-{"_t":"StartSceneConfig","_id":3,"Process":3,"Zone":1,"SceneType":"BenchmarkClient","Name":"BenchmarkClient2","OuterPort":30003},
+{"_t":"StartSceneConfig","_id":2,"Process":1,"Zone":1,"SceneType":"BenchmarkClient","Name":"BenchmarkClient1","OuterPort":30002},
 ]}

Config/GenJson/s/StartConfig/Benchmark/StartZoneConfig.txt

@@ -1,3 +1,3 @@
 {"list":[
-{"_t":"StartZoneConfig","_id":1,"DBConnection":"mongodb://127.0.0.1","DBName":"ET1"},
+{"_t":"StartZoneConfig","_id":1,"DBConnection":"mongodb://127.0.0.1:27017","DBName":"StarEscort"},
 ]}

Config/GenJson/s/StartConfig/Localhost/StartProcessConfig.txt

@@ -1,3 +1,6 @@
 {"list":[
 {"_t":"StartProcessConfig","_id":1,"MachineId":1,"InnerPort":20101},
+{"_t":"StartProcessConfig","_id":2,"MachineId":1,"InnerPort":20102},
+{"_t":"StartProcessConfig","_id":3,"MachineId":1,"InnerPort":20103},
+{"_t":"StartProcessConfig","_id":4,"MachineId":1,"InnerPort":20104},
 ]}

Config/GenJson/s/StartConfig/Localhost/StartSceneConfig.txt

@@ -1,7 +1,6 @@
 {"list":[
-{"_t":"StartSceneConfig","_id":1,"Process":1,"Zone":1,"SceneType":"Realm","Name":"Realm","OuterPort":30002},
-{"_t":"StartSceneConfig","_id":10001,"Process":1,"Zone":1,"SceneType":"Game","Name":"Game1","OuterPort":30003},
-{"_t":"StartSceneConfig","_id":200,"Process":1,"Zone":2,"SceneType":"Robot","Name":"Robot01","OuterPort":0},
+{"_t":"StartSceneConfig","_id":1,"Process":3,"Zone":1,"SceneType":"Realm","Name":"Realm","OuterPort":30002},
+{"_t":"StartSceneConfig","_id":10001,"Process":4,"Zone":1,"SceneType":"Game","Name":"Game1","OuterPort":30003},
 {"_t":"StartSceneConfig","_id":300,"Process":1,"Zone":3,"SceneType":"RouterManager","Name":"RouterManager","OuterPort":30300},
-{"_t":"StartSceneConfig","_id":301,"Process":1,"Zone":3,"SceneType":"Router","Name":"Router01","OuterPort":30301},
+{"_t":"StartSceneConfig","_id":301,"Process":2,"Zone":3,"SceneType":"Router","Name":"Router01","OuterPort":30301},
 ]}

Config/GenJson/s/StartConfig/Release/StartProcessConfig.txt

@@ -1,3 +1,6 @@
 {"list":[
 {"_t":"StartProcessConfig","_id":1,"MachineId":1,"InnerPort":20101},
+{"_t":"StartProcessConfig","_id":2,"MachineId":1,"InnerPort":20102},
+{"_t":"StartProcessConfig","_id":3,"MachineId":1,"InnerPort":20103},
+{"_t":"StartProcessConfig","_id":4,"MachineId":1,"InnerPort":20104},
 ]}

Config/GenJson/s/StartConfig/Release/StartSceneConfig.txt

@@ -1,6 +1,6 @@
 {"list":[
-{"_t":"StartSceneConfig","_id":1,"Process":1,"Zone":1,"SceneType":"Realm","Name":"Realm","OuterPort":30002},
-{"_t":"StartSceneConfig","_id":10001,"Process":1,"Zone":1,"SceneType":"Game","Name":"Game1","OuterPort":30003},
+{"_t":"StartSceneConfig","_id":1,"Process":3,"Zone":1,"SceneType":"Realm","Name":"Realm","OuterPort":30002},
+{"_t":"StartSceneConfig","_id":10001,"Process":4,"Zone":1,"SceneType":"Game","Name":"Game1","OuterPort":30003},
 {"_t":"StartSceneConfig","_id":300,"Process":1,"Zone":3,"SceneType":"RouterManager","Name":"RouterManager","OuterPort":30300},
-{"_t":"StartSceneConfig","_id":301,"Process":1,"Zone":3,"SceneType":"Router","Name":"Router01","OuterPort":40301},
+{"_t":"StartSceneConfig","_id":301,"Process":2,"Zone":3,"SceneType":"Router","Name":"Router01","OuterPort":40301},
 ]}

DotNet/App/Properties/launchSettings.json

@@ -2,7 +2,7 @@
   "profiles": {
     "DotNet.App": {
       "commandName": "Project",
-      "commandLineArgs": "--AppType=Server"
+      "commandLineArgs": "--AppType=Watcher"
     }
   }
-}
+}

GameServer/Config/GenFromExcel/s/StartConfig/Benchmark/StartMachineConfigCategory.bytes

@@ -1,2 +1,2 @@
 
-
	127.0.0.1	127.0.0.1"10000
+'

192.168.0.102
192.168.0.102"10000

GameServer/Config/GenFromExcel/s/StartConfig/Benchmark/StartProcessConfigCategory.bytes

@@ -1,4 +1,2 @@
 
-

�

-
�

-
�

+

�

GameServer/Config/GenFromExcel/s/StartConfig/Benchmark/StartSceneConfigCategory.bytes

@@ -1,4 +1,3 @@
 
 ,


"BenchmarkServer*BenchmarkServer0±ê

--
"BenchmarkClient*BenchmarkClient10²ê

--
"BenchmarkClient*BenchmarkClient20³ê

+-

"BenchmarkClient*BenchmarkClient10²ê

GameServer/Config/GenFromExcel/s/StartConfig/Benchmark/StartZoneConfigCategory.bytes

@@ -1,2 +1,3 @@
 
-
mongodb://127.0.0.1ET1
+)
mongodb://127.0.0.1:27017
+StarEscort

GameServer/Config/GenFromExcel/s/StartConfig/Localhost/StartProcessConfigCategory.bytes

@@ -1,2 +1,5 @@
 
-

�

+

�

+
�

+
�

+
�

GameServer/Config/GenFromExcel/s/StartConfig/Localhost/StartSceneConfigCategory.bytes

@@ -1,6 +1,5 @@
 
-


"Realm*Realm0²ê

-‘N

"Game*Game10³ê

-È

"Robot*Robot01
+

"Realm*Realm0²ê

+‘N
"Game*Game10³ê

 )¬
"
RouterManager*
RouterManager0Üì

-­
"Router*Router010Ýì

+­"Router*Router010Ýì

GameServer/Config/GenFromExcel/s/StartConfig/Release/StartProcessConfigCategory.bytes

@@ -1,2 +1,5 @@
 
-

�

+

�

+
�

+
�

+
�

GameServer/Config/GenFromExcel/s/StartConfig/Release/StartSceneConfigCategory.bytes

@@ -1,5 +1,5 @@
 
-


"Realm*Realm0²ê

-‘N

"Game*Game10³ê

+

"Realm*Realm0²ê

+‘N
"Game*Game10³ê

 )¬
"
RouterManager*
RouterManager0Üì

-­
"Router*Router010íº
+­"Router*Router010íº

GameServer/Config/GenJson/s/StartConfig/Benchmark/StartMachineConfig.txt

@@ -1,3 +1,3 @@
 {"list":[
-{"_t":"StartMachineConfig","_id":1,"InnerIP":"127.0.0.1","OuterIP":"127.0.0.1","WatcherPort":"10000"},
+{"_t":"StartMachineConfig","_id":1,"InnerIP":"192.168.0.102","OuterIP":"192.168.0.102","WatcherPort":"10000"},
 ]}

GameServer/Config/GenJson/s/StartConfig/Benchmark/StartProcessConfig.txt

@@ -1,5 +1,3 @@
 {"list":[
 {"_t":"StartProcessConfig","_id":1,"MachineId":1,"InnerPort":20101},
-{"_t":"StartProcessConfig","_id":2,"MachineId":1,"InnerPort":20102},
-{"_t":"StartProcessConfig","_id":3,"MachineId":1,"InnerPort":20103},
 ]}

GameServer/Config/GenJson/s/StartConfig/Benchmark/StartSceneConfig.txt

@@ -1,5 +1,4 @@
 {"list":[
 {"_t":"StartSceneConfig","_id":1,"Process":1,"Zone":1,"SceneType":"BenchmarkServer","Name":"BenchmarkServer","OuterPort":30001},
-{"_t":"StartSceneConfig","_id":2,"Process":2,"Zone":1,"SceneType":"BenchmarkClient","Name":"BenchmarkClient1","OuterPort":30002},
-{"_t":"StartSceneConfig","_id":3,"Process":3,"Zone":1,"SceneType":"BenchmarkClient","Name":"BenchmarkClient2","OuterPort":30003},
+{"_t":"StartSceneConfig","_id":2,"Process":1,"Zone":1,"SceneType":"BenchmarkClient","Name":"BenchmarkClient1","OuterPort":30002},
 ]}

GameServer/Config/GenJson/s/StartConfig/Benchmark/StartZoneConfig.txt

@@ -1,3 +1,3 @@
 {"list":[
-{"_t":"StartZoneConfig","_id":1,"DBConnection":"mongodb://127.0.0.1","DBName":"ET1"},
+{"_t":"StartZoneConfig","_id":1,"DBConnection":"mongodb://127.0.0.1:27017","DBName":"StarEscort"},
 ]}

GameServer/Config/GenJson/s/StartConfig/Localhost/StartProcessConfig.txt

@@ -1,3 +1,6 @@
 {"list":[
 {"_t":"StartProcessConfig","_id":1,"MachineId":1,"InnerPort":20101},
+{"_t":"StartProcessConfig","_id":2,"MachineId":1,"InnerPort":20102},
+{"_t":"StartProcessConfig","_id":3,"MachineId":1,"InnerPort":20103},
+{"_t":"StartProcessConfig","_id":4,"MachineId":1,"InnerPort":20104},
 ]}

GameServer/Config/GenJson/s/StartConfig/Localhost/StartSceneConfig.txt

@@ -1,7 +1,6 @@
 {"list":[
-{"_t":"StartSceneConfig","_id":1,"Process":1,"Zone":1,"SceneType":"Realm","Name":"Realm","OuterPort":30002},
-{"_t":"StartSceneConfig","_id":10001,"Process":1,"Zone":1,"SceneType":"Game","Name":"Game1","OuterPort":30003},
-{"_t":"StartSceneConfig","_id":200,"Process":1,"Zone":2,"SceneType":"Robot","Name":"Robot01","OuterPort":0},
+{"_t":"StartSceneConfig","_id":1,"Process":3,"Zone":1,"SceneType":"Realm","Name":"Realm","OuterPort":30002},
+{"_t":"StartSceneConfig","_id":10001,"Process":4,"Zone":1,"SceneType":"Game","Name":"Game1","OuterPort":30003},
 {"_t":"StartSceneConfig","_id":300,"Process":1,"Zone":3,"SceneType":"RouterManager","Name":"RouterManager","OuterPort":30300},
-{"_t":"StartSceneConfig","_id":301,"Process":1,"Zone":3,"SceneType":"Router","Name":"Router01","OuterPort":30301},
+{"_t":"StartSceneConfig","_id":301,"Process":2,"Zone":3,"SceneType":"Router","Name":"Router01","OuterPort":30301},
 ]}

GameServer/Config/GenJson/s/StartConfig/Release/StartProcessConfig.txt

@@ -1,3 +1,6 @@
 {"list":[
 {"_t":"StartProcessConfig","_id":1,"MachineId":1,"InnerPort":20101},
+{"_t":"StartProcessConfig","_id":2,"MachineId":1,"InnerPort":20102},
+{"_t":"StartProcessConfig","_id":3,"MachineId":1,"InnerPort":20103},
+{"_t":"StartProcessConfig","_id":4,"MachineId":1,"InnerPort":20104},
 ]}

GameServer/Config/GenJson/s/StartConfig/Release/StartSceneConfig.txt

@@ -1,6 +1,6 @@
 {"list":[
-{"_t":"StartSceneConfig","_id":1,"Process":1,"Zone":1,"SceneType":"Realm","Name":"Realm","OuterPort":30002},
-{"_t":"StartSceneConfig","_id":10001,"Process":1,"Zone":1,"SceneType":"Game","Name":"Game1","OuterPort":30003},
+{"_t":"StartSceneConfig","_id":1,"Process":3,"Zone":1,"SceneType":"Realm","Name":"Realm","OuterPort":30002},
+{"_t":"StartSceneConfig","_id":10001,"Process":4,"Zone":1,"SceneType":"Game","Name":"Game1","OuterPort":30003},
 {"_t":"StartSceneConfig","_id":300,"Process":1,"Zone":3,"SceneType":"RouterManager","Name":"RouterManager","OuterPort":30300},
-{"_t":"StartSceneConfig","_id":301,"Process":1,"Zone":3,"SceneType":"Router","Name":"Router01","OuterPort":40301},
+{"_t":"StartSceneConfig","_id":301,"Process":2,"Zone":3,"SceneType":"Router","Name":"Router01","OuterPort":40301},
 ]}

GameServer/启动游戏服-Localhost配置.bat

@@ -1,5 +1,5 @@
 @echo off
 
 cd DebugBin
-App.exe --AppType=Server --StartConfig=StartConfig/Localhost
+App.exe --AppType=Watcher --StartConfig=StartConfig/Localhost
 @pause

GameServer/启动游戏服-Release配置.bat

@@ -1,5 +1,5 @@
 @echo off
 
 cd DebugBin
-App.exe --AppType=Server --StartConfig=StartConfig/Release --InitAccessToken=1
+App.exe --AppType=Watcher --StartConfig=StartConfig/Release --InitAccessToken=1
 @pause

Unity/Assets/Res/Config/GenFromExcel/AIConfigCategory.bytes.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: 0ce8e5cdc2a99ea4f89d259ed7e4a60a
-TextScriptImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Unity/Assets/Res/Config/GenFromExcel/CharacterCategory.bytes.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: 56b380f95a382ca47b157caf04473b23
-TextScriptImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Unity/Assets/Res/Config/GenFromExcel/ItemIdConfigCategory.bytes.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: e42d3ee868f8836449ae8af67f104213
-TextScriptImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Unity/Assets/Res/Config/GenFromExcel/ItemTypeConfigCategory.bytes.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: a1f700982538903428f54fbd2d45d66a
-TextScriptImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Unity/Assets/Res/Config/GenFromExcel/MapConfigCategory.bytes.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: e093c2d3d36a484429a12e94b35988bb
-TextScriptImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Unity/Assets/Res/Config/GenFromExcel/MonsterCategory.bytes.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: ee066fd7d87f22841976e661a5293082
-TextScriptImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Unity/Assets/Res/Config/GenFromExcel/SkillConfigCategory.bytes.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: dcc7f4c771051224399b546b925b2fe6
-TextScriptImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Unity/Assets/Res/Config/GenFromExcel/UnitConfigCategory.bytes.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: 87c7e5aaf7231aa4f93ac95e494e71f9
-TextScriptImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Unity/Assets/Res/Config/GenFromExcel/UpLevelExpCategory.bytes.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: 16646337c9d119c47b40cef592d5d45e
-TextScriptImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Unity/Assets/Scripts/Codes/Model/Client/Generate/Config/MapConfig.cs.meta

@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: 428e0f636fc25214492eea715c19dda7
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Unity/Assets/Scripts/Codes/Model/Client/Generate/Message/BattleServerMsg_CS_40001.cs.meta

@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: 0f8b6369de1b9da448ac2f8d9642bfdc
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Unity/Assets/Scripts/Codes/Model/Client/Generate/Message/OuterMessage_C_10001.cs.meta

@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: 26923f18a432ab740b53d6d218076c02
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Unity/Assets/Scripts/Codes/Model/Client/Generate/Message/PlayerProto_CS_30001.cs.meta

@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: b804cc6168290bc4f9d5eaf118e400b3
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Unity/Packages/packages-lock.json

@@ -61,7 +61,7 @@
       "url": "https://packages.unity.cn"
     },
     "com.unity.ide.rider": {
-      "version": "3.0.18",
+      "version": "3.0.24",
       "depth": 0,
       "source": "registry",
       "dependencies": {
@@ -70,7 +70,7 @@
       "url": "https://packages.unity.cn"
     },
     "com.unity.ide.visualstudio": {
-      "version": "2.0.17",
+      "version": "2.0.20",
       "depth": 0,
       "source": "registry",
       "dependencies": {

Unity/Unity.sln.DotSettings

@@ -341,7 +341,7 @@ II.2.12 <HandlesEvent />
 	<s:String x:Key="/Default/CodeStyle/Generate/=Properties/Options/=XmlDocumentation/@EntryIndexedValue">False</s:String>
 	<s:Boolean x:Key="/Default/CodeStyle/Naming/CSharpAutoNaming/IsNamingAutoDetectionCompleted/@EntryValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/CodeStyle/Naming/CSharpAutoNaming/IsNotificationDisabled/@EntryValue">True</s:Boolean>
-	
+
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/AutoDetectedNamingRules/=Constants/@EntryIndexedValue">&lt;Policy Inspect="False" Prefix="" Suffix="" Style="AaBb" /&gt;</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/AutoDetectedNamingRules/=EnumMember/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /&gt;</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/AutoDetectedNamingRules/=Event/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /&gt;</s:String>
@@ -377,27 +377,28 @@ II.2.12 &lt;HandlesEvent /&gt;&#xD;
 	<s:Int64 x:Key="/Default/Environment/Hierarchy/GeneratedFilesCacheKey/Timestamp/@EntryValue">79</s:Int64>
 	<s:Boolean x:Key="/Default/Environment/Hierarchy/NuGetOptions/GlobalEnabled/@EntryValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/Environment/Hierarchy/NuGetOptions/IncludePrerelease/@EntryValue">False</s:Boolean>
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 	<s:Boolean x:Key="/Default/Environment/OpenDocument/OpenDocumentAfterModification/@EntryValue">True</s:Boolean>
 	<s:String x:Key="/Default/Environment/ReSharperHost/CurrentTheme/@EntryValue">Dark</s:String>
 	<s:Boolean x:Key="/Default/Environment/SearchAndNavigation/AutoExpandResults/@EntryValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/Environment/SearchAndNavigation/MergeOccurences/@EntryValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/Environment/SearchAndNavigation/OpenPreviewTabForSelectedItemInFindResults/@EntryValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EApplication_002EExceptionReport_002EUserLoginInformationMigrateSettings/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EdotCover_002EInteractive_002ECore_002EFilterManagement_002EMigration_002EGlobalFilterSettingsManagerMigrateSettings/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpAttributeForSingleLineMethodUpgrade/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpFileLayoutPatternsUpgrade/@EntryIndexedValue">True</s:Boolean>
@@ -422,7 +423,7 @@ II.2.12 &lt;HandlesEvent /&gt;&#xD;
 	<s:String x:Key="/Default/GlobalFilterSettingsManager/AttributeFilterXml/@EntryValue">&lt;data&gt;&lt;AttributeFilter ClassMask="System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverageAttribute" IsEnabled="True" /&gt;&lt;AttributeFilter ClassMask="System.CodeDom.Compiler.GeneratedCodeAttribute" IsEnabled="True" /&gt;&lt;/data&gt;</s:String>
 	<s:Boolean x:Key="/Default/Housekeeping/FeatureSuggestion/FeatureSuggestionManager/DisabledSuggesters/=SwitchToGoToActionSuggester/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/Housekeeping/FeatureSuggestion/FeatureSuggestionManager/DisabledSuggesters/=TabNavigationExplainer/@EntryIndexedValue">True</s:Boolean>
-	<s:String x:Key="/Default/Housekeeping/FeedbackReport/SelectedUserIdentificator/@EntryValue">anonymous</s:String>
+
 	<s:Boolean x:Key="/Default/Housekeeping/GlobalSettingsUpgraded/IsUpgraded/@EntryValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/Housekeeping/IntellisenseHousekeeping/HintUsed/@EntryValue">True</s:Boolean>
 	<s:String x:Key="/Default/Housekeeping/Layout/DialogWindows/OptionsDialog/SelectedPageId/@EntryValue">CSharpBracesLayoutPage</s:String>
@@ -999,4 +1000,4 @@ II.2.12 &lt;HandlesEvent /&gt;&#xD;
 	<s:Boolean x:Key="/Default/RiderDebugger/RiderRestoreDecompile/RestoreDecompileSetting/@EntryValue">False</s:Boolean>
 	<s:String x:Key="/Default/SnapshotsStore/CurrentStore/@EntryValue">C:\Users\USER-PC\AppData\Local\JetBrains\Shared\vAny\Sessions</s:String>
 	<s:Boolean x:Key="/Default/SymbolServers/RestoreDecompileSetting/@EntryValue">False</s:Boolean>
-	<s:Double x:Key="/Default/TimelineLayout/MethodsPanelHeight/@EntryValue">366</s:Double></wpf:ResourceDictionary>
+	<s:Double x:Key="/Default/TimelineLayout/MethodsPanelHeight/@EntryValue">366</s:Double></wpf:ResourceDictionary>