Libs跟Analyzer挪到Share目录

DotNet/Hotfix/DotNet.Hotfix.csproj

@@ -34,7 +34,7 @@
         </Compile> 
     </ItemGroup>
     <ItemGroup>
-        <ProjectReference Include="..\..\Codes\Analyzer\Share.Analyzer.csproj" OutputItemType="Analyzer" ReferenceOutputAssembly="false" />
+        <ProjectReference Include="..\..\Share\Analyzer\Share.Analyzer.csproj" OutputItemType="Analyzer" ReferenceOutputAssembly="false" />
         <ProjectReference Include="..\Model\DotNet.Model.csproj" />
     </ItemGroup>
 

DotNet/Model/DotNet.Model.csproj

@@ -49,7 +49,7 @@
         
     </ItemGroup> 
     <ItemGroup> 
-        <ProjectReference Include="..\..\Codes\Analyzer\Share.Analyzer.csproj" OutputItemType="Analyzer" ReferenceOutputAssembly="false" />
+        <ProjectReference Include="..\..\Share\Analyzer\Share.Analyzer.csproj" OutputItemType="Analyzer" ReferenceOutputAssembly="false" />
         <ProjectReference Include="..\Core\DotNet.Core.csproj" />
         <ProjectReference Include="..\ThirdParty\DotNet.ThirdParty.csproj" />
     </ItemGroup>

ET.sln

@@ -35,11 +35,11 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DotNet.ThirdParty", "DotNet
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DotNet.Tool", "DotNet\Tool\DotNet.Tool.csproj", "{4D3690A7-9EB1-4AF2-BEE1-8684BD252A96}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Share.Analyzer", "Codes\Analyzer\Share.Analyzer.csproj", "{E7B6E5F0-094C-43E9-B4AA-8EB39CD93168}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Unity.Codes", "Unity\Unity.Codes.csproj", "{C8CDB918-7F4F-0E46-C7AA-900F18D8C944}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Share", "Share", "{5374A1E3-B216-4BF6-A6A4-DA4B41D9F434}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Share", "Share", "{1272AF7B-A962-4BA4-8A9C-FFA7E131A0AC}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Unity.Codes", "Unity\Unity.Codes.csproj", "{C8CDB918-7F4F-0E46-C7AA-900F18D8C944}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Share.Analyzer", "Share\Analyzer\Share.Analyzer.csproj", "{FCB2EF97-BA34-49F7-B859-68E1AC98877E}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -219,18 +219,6 @@ Global
 		{4D3690A7-9EB1-4AF2-BEE1-8684BD252A96}.Release|x64.Build.0 = Release|Any CPU
 		{4D3690A7-9EB1-4AF2-BEE1-8684BD252A96}.Release|x86.ActiveCfg = Release|Any CPU
 		{4D3690A7-9EB1-4AF2-BEE1-8684BD252A96}.Release|x86.Build.0 = Release|Any CPU
-		{E7B6E5F0-094C-43E9-B4AA-8EB39CD93168}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{E7B6E5F0-094C-43E9-B4AA-8EB39CD93168}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{E7B6E5F0-094C-43E9-B4AA-8EB39CD93168}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{E7B6E5F0-094C-43E9-B4AA-8EB39CD93168}.Debug|x64.Build.0 = Debug|Any CPU
-		{E7B6E5F0-094C-43E9-B4AA-8EB39CD93168}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{E7B6E5F0-094C-43E9-B4AA-8EB39CD93168}.Debug|x86.Build.0 = Debug|Any CPU
-		{E7B6E5F0-094C-43E9-B4AA-8EB39CD93168}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{E7B6E5F0-094C-43E9-B4AA-8EB39CD93168}.Release|Any CPU.Build.0 = Release|Any CPU
-		{E7B6E5F0-094C-43E9-B4AA-8EB39CD93168}.Release|x64.ActiveCfg = Release|Any CPU
-		{E7B6E5F0-094C-43E9-B4AA-8EB39CD93168}.Release|x64.Build.0 = Release|Any CPU
-		{E7B6E5F0-094C-43E9-B4AA-8EB39CD93168}.Release|x86.ActiveCfg = Release|Any CPU
-		{E7B6E5F0-094C-43E9-B4AA-8EB39CD93168}.Release|x86.Build.0 = Release|Any CPU
 		{C8CDB918-7F4F-0E46-C7AA-900F18D8C944}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{C8CDB918-7F4F-0E46-C7AA-900F18D8C944}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{C8CDB918-7F4F-0E46-C7AA-900F18D8C944}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -243,6 +231,18 @@ Global
 		{C8CDB918-7F4F-0E46-C7AA-900F18D8C944}.Release|x64.Build.0 = Debug|Any CPU
 		{C8CDB918-7F4F-0E46-C7AA-900F18D8C944}.Release|x86.ActiveCfg = Debug|Any CPU
 		{C8CDB918-7F4F-0E46-C7AA-900F18D8C944}.Release|x86.Build.0 = Debug|Any CPU
+		{FCB2EF97-BA34-49F7-B859-68E1AC98877E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{FCB2EF97-BA34-49F7-B859-68E1AC98877E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{FCB2EF97-BA34-49F7-B859-68E1AC98877E}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{FCB2EF97-BA34-49F7-B859-68E1AC98877E}.Debug|x64.Build.0 = Debug|Any CPU
+		{FCB2EF97-BA34-49F7-B859-68E1AC98877E}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{FCB2EF97-BA34-49F7-B859-68E1AC98877E}.Debug|x86.Build.0 = Debug|Any CPU
+		{FCB2EF97-BA34-49F7-B859-68E1AC98877E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{FCB2EF97-BA34-49F7-B859-68E1AC98877E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{FCB2EF97-BA34-49F7-B859-68E1AC98877E}.Release|x64.ActiveCfg = Release|Any CPU
+		{FCB2EF97-BA34-49F7-B859-68E1AC98877E}.Release|x64.Build.0 = Release|Any CPU
+		{FCB2EF97-BA34-49F7-B859-68E1AC98877E}.Release|x86.ActiveCfg = Release|Any CPU
+		{FCB2EF97-BA34-49F7-B859-68E1AC98877E}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -262,8 +262,8 @@ Global
 		{6AFC109E-85DE-4A14-9C81-95D93C3F90AE} = {46008B91-6EC0-448B-8D1A-D8C6D2EEBEF4}
 		{4B15C845-B5BD-4105-AE91-9B057F8AC134} = {46008B91-6EC0-448B-8D1A-D8C6D2EEBEF4}
 		{4D3690A7-9EB1-4AF2-BEE1-8684BD252A96} = {46008B91-6EC0-448B-8D1A-D8C6D2EEBEF4}
-		{E7B6E5F0-094C-43E9-B4AA-8EB39CD93168} = {5374A1E3-B216-4BF6-A6A4-DA4B41D9F434}
 		{C8CDB918-7F4F-0E46-C7AA-900F18D8C944} = {914C77C9-212A-4DD0-8D9A-074620E77FAA}
+		{FCB2EF97-BA34-49F7-B859-68E1AC98877E} = {1272AF7B-A962-4BA4-8A9C-FFA7E131A0AC}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {EABC01E3-3EB5-47EF-B46E-AAD8BB3585F1}

Codes/Analyzer/Share.Analyzer.csproj → Share/Analyzer/Share.Analyzer.csproj

@@ -7,6 +7,11 @@
         <LangVersion>10</LangVersion>
     </PropertyGroup>
 
+    <PropertyGroup>
+        <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
+        <SatelliteResourceLanguages>en</SatelliteResourceLanguages>
+    </PropertyGroup>
+
     <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
         <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
         <NoWarn>1701;1702;RS2008</NoWarn>

Unity/Assets/Scripts/Codes/Hotfix/Server/Demo/Gate/C2G_EnterMapHandler.cs

@@ -10,8 +10,6 @@ namespace ET.Server
 		{
 			Player player = session.GetComponent<SessionPlayerComponent>().GetMyPlayer();
 
-			
-			
 			// 在Gate上动态创建一个Map Scene，把Unit从DB中加载放进来，然后传送到真正的Map中，这样登陆跟传送的逻辑就完全一样了
 			GateMapComponent gateMapComponent = player.AddComponent<GateMapComponent>();
 			gateMapComponent.Scene = await SceneFactory.Create(gateMapComponent, "GateMap", SceneType.Map);

Unity/Assets/Scripts/Codes/HotfixView/Client/Demo/UI/UILogin/UILoginComponentSystem.cs

@@ -13,7 +13,7 @@ namespace ET.Client
 			{
 				ReferenceCollector rc = self.GetParent<UI>().GameObject.GetComponent<ReferenceCollector>();
 				self.loginBtn = rc.Get<GameObject>("LoginBtn");
-			
+				
 				self.loginBtn.GetComponent<Button>().onClick.AddListener(()=> { self.OnLogin(); });
 				self.account = rc.Get<GameObject>("Account");
 				self.password = rc.Get<GameObject>("Password");

Unity/Assets/Scripts/Editor/AssetPostProcessor/OnGenerateCSProjectProcessor.cs

@@ -109,7 +109,7 @@ namespace ET
             }
 
             var projectReference = newDoc.CreateElement("ProjectReference", newDoc.DocumentElement.NamespaceURI);
-            projectReference.SetAttribute("Include", @"..\Codes\Analyzer\Share.Analyzer.csproj");
+            projectReference.SetAttribute("Include", @"..\Share\Analyzer\Share.Analyzer.csproj");
             projectReference.SetAttribute("OutputItemType", @"Analyzer");
             projectReference.SetAttribute("ReferenceOutputAssembly", @"false");
 

Unity/ProjectSettings/ProjectSettings.asset

@@ -750,7 +750,7 @@ PlayerSettings:
   scriptingDefineSymbols:
     Android: NETSTANDARD2_0;UNITY
     Server: NETSTANDARD2_0;UNITY
-    Standalone: NETSTANDARD2_0;UNITY;ENABLE_CODES
+    Standalone: NETSTANDARD2_0;UNITY
     WebGL: NETSTANDARD2_0;UNITY
     iPhone: NETSTANDARD2_0;UNITY
   additionalCompilerArguments: {}