修复宏的问题

Codes/Hotfix/Server/Module/DB/DBComponentSystem.cs

@@ -1,4 +1,4 @@
-#if !UNITY_64
+#if DOTNET
 using System;
 using System.Collections.Generic;
 using System.Linq.Expressions;

Codes/Hotfix/Server/Module/DB/DBManagerComponentSystem.cs

@@ -1,4 +1,4 @@
-#if !UNITY_64
+#if DOTNET
 using System;
 
 namespace ET.Server

Codes/Model/Server/Module/DB/DBComponent.cs

@@ -1,4 +1,4 @@
-#if !UNITY_64
+#if DOTNET
 using MongoDB.Driver;
 
 namespace ET.Server

Codes/Model/Server/Module/DB/DBManagerComponent.cs

@@ -1,4 +1,4 @@
-#if !UNITY_64
+#if DOTNET
 namespace ET.Server
 {
     

Codes/Model/Server/Module/DB/IDBCollection.cs

@@ -1,4 +1,4 @@
-#if !UNITY_64
+#if DOTNET
 namespace ET.Server
 {
     public interface IDBCollection

Codes/Model/Share/Module/Timer/TimerComponent.cs

@@ -276,7 +276,7 @@ namespace ET
 
         public static long NewFrameTimer(this TimerComponent self, int type, object args)
         {
-#if APPS
+#if DOTNET
 			return self.NewRepeatedTimerInner(100, type, args);
 #else
             return self.NewRepeatedTimerInner(0, type, args);
@@ -288,7 +288,7 @@ namespace ET
         /// </summary>
         private static long NewRepeatedTimerInner(this TimerComponent self, long time, int type, object args)
         {
-#if APPS
+#if DOTNET
 			if (time < 100)
 			{ 
 				throw new Exception($"repeated timer < 100, timerType: time: {time}");

DotNet/App/DotNet.App.csproj

@@ -14,13 +14,13 @@
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
-    <DefineConstants>TRACE2_0;SERVER;NOT_UNITY;APPS</DefineConstants>
+    <DefineConstants>DOTNET</DefineConstants>
     <OutputPath>..\..\Bin\</OutputPath>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
-    <DefineConstants>TRACE2_0;SERVER;NOT_UNITY;APPS</DefineConstants>
+    <DefineConstants>DOTNET</DefineConstants>
     <OutputPath>..\..\Bin\</OutputPath>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
   </PropertyGroup>

DotNet/Core/DotNet.Core.csproj

@@ -15,14 +15,14 @@
 
     <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
       <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-      <DefineConstants>TRACE;APPS</DefineConstants>
+      <DefineConstants>DOTNET</DefineConstants>
       <OutputPath>..\..\Bin\</OutputPath>
       <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
     </PropertyGroup>
 
     <PropertyGroup Condition=" '$(Configuration)' == 'Release' "> 
       <AllowUnsafeBlocks>true</AllowUnsafeBlocks> 
-      <DefineConstants>TRACE;APPS</DefineConstants>
+      <DefineConstants>DOTNET</DefineConstants>
       <OutputPath>..\..\Bin\</OutputPath>
       <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
     </PropertyGroup>

DotNet/Hotfix/DotNet.Hotfix.csproj

@@ -10,12 +10,12 @@
         <SatelliteResourceLanguages>en</SatelliteResourceLanguages>
     </PropertyGroup>
     <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
-        <DefineConstants>TRACE2_0;NOT_UNITY;APPS;</DefineConstants>
+        <DefineConstants>DOTNET</DefineConstants>
         <OutputPath>..\..\Bin\</OutputPath> 
         <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
     </PropertyGroup>
     <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
-        <DefineConstants>TRACE2_0;SERVER;NOT_UNITY;APPS</DefineConstants>
+        <DefineConstants>DOTNET</DefineConstants>
         <OutputPath>..\..\Bin\</OutputPath>
         <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
     </PropertyGroup>

DotNet/Model/DotNet.Model.csproj

@@ -10,13 +10,13 @@
         <SatelliteResourceLanguages>en</SatelliteResourceLanguages>
     </PropertyGroup>
     <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
-        <DefineConstants>TRACE2_0;NOT_UNITY;APPS</DefineConstants>
+        <DefineConstants>DOTNET</DefineConstants>
         <OutputPath>..\..\Bin\</OutputPath>
         <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
         <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
     </PropertyGroup>
     <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
-        <DefineConstants>TRACE2_0;SERVER;NOT_UNITY;APPS</DefineConstants>
+        <DefineConstants>DOTNET</DefineConstants>
         <OutputPath>..\..\Bin\</OutputPath>
         <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
         <TreatWarningsAsErrors>true</TreatWarningsAsErrors>

DotNet/ThirdParty/DotNet.ThirdParty.csproj

@@ -14,14 +14,14 @@
     </PropertyGroup>
     
     <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
-      <DefineConstants>TRACE;NOT_UNITY;APPS</DefineConstants>
+      <DefineConstants>DOTNET</DefineConstants>
       <OutputPath>..\..\Bin\</OutputPath>
       <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
       <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
     </PropertyGroup>
     
     <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
-      <DefineConstants>TRACE;NOT_UNITY;APPS</DefineConstants>
+      <DefineConstants>DOTNET</DefineConstants>
       <OutputPath>..\..\Bin\</OutputPath>
       <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
       <TreatWarningsAsErrors>true</TreatWarningsAsErrors>

DotNet/Tool/DotNet.Tool.csproj

@@ -19,14 +19,14 @@
     <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
       <OutputPath>..\..\Bin\</OutputPath>
       <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-      <DefineConstants>TRACECOREAPP;NOT_UNITY;APPS</DefineConstants>
+      <DefineConstants>DOTNET</DefineConstants>
       <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
     </PropertyGroup>
 
     <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
       <OutputPath>..\..\Bin\</OutputPath>
       <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-      <DefineConstants>TRACECOREAPP;NOT_UNITY;APPS</DefineConstants>
+      <DefineConstants>DOTNET</DefineConstants>
       <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
     </PropertyGroup>