合并master

Unity/Assets/Scripts/Codes/Hotfix/Server/Module/DB/DBComponentSystem.cs

@@ -138,7 +138,7 @@ namespace ET.Server
 		    
 		    if (collection == null)
 		    {
-			    collection = entity.GetType().Name;
+			    collection = entity.GetType().FullName;
 		    }
 
 		    using (await CoroutineLockComponent.Instance.Wait(CoroutineLockType.DB, entity.Id % DBComponent.TaskCount))
@@ -158,7 +158,7 @@ namespace ET.Server
 
 		    if (collection == null)
 		    {
-			    collection = entity.GetType().Name;
+			    collection = entity.GetType().FullName;
 		    }
 
 		    using (await CoroutineLockComponent.Instance.Wait(CoroutineLockType.DB, taskId % DBComponent.TaskCount))
@@ -184,7 +184,7 @@ namespace ET.Server
 					    continue;
 				    }
 
-				    await self.GetCollection(entity.GetType().Name)
+				    await self.GetCollection(entity.GetType().FullName)
 						    .ReplaceOneAsync(d => d.Id == entity.Id, entity, new ReplaceOptions { IsUpsert = true });
 			    }
 		    }

Unity/Assets/Scripts/Codes/Hotfix/Server/Module/RobotCase/ARobotCase.cs

@@ -17,7 +17,7 @@ namespace ET.Server
             catch (System.Exception e)
             {
                 Log.Error($"{robotCase.DomainZone()} {e}");
-                RobotLog.Console($"RobotCase Error {this.GetType().Name}:\n\t{e}");
+                RobotLog.Console($"RobotCase Error {this.GetType().FullName}:\n\t{e}");
             }
         }
     }

Unity/Assets/Scripts/Codes/Model/Server/Module/Message/AMRpcHandler.cs

@@ -18,7 +18,7 @@ namespace ET.Server
                 Request request = message as Request;
                 if (request == null)
                 {
-                    throw new Exception($"消息类型转换错误: {message.GetType().Name} to {typeof (Request).Name}");
+                    throw new Exception($"消息类型转换错误: {message.GetType().FullName} to {typeof (Request).FullName}");
                 }
 
                 int rpcId = request.RpcId;

Unity/Assets/Scripts/Codes/Model/Share/Module/Unit/Unit.cs

@@ -55,7 +55,7 @@ namespace ET
         {
             get
             {
-                return $"{this.GetType().Name} ({this.Id})";
+                return $"{this.GetType().FullName} ({this.Id})";
             }
         }
     }

Unity/Assets/Scripts/Core/Module/Entity/Entity.cs

@@ -103,7 +103,7 @@ namespace ET
         {
             get
             {
-                return this.GetType().Name;
+                return this.GetType().FullName;
             }
         }
 

Unity/Assets/Scripts/Core/Module/Entity/EntityRef.cs.meta

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: ef22211834964fd8aced938aa4307f76
+timeCreated: 1683206917

Unity/Assets/Scripts/Core/Module/EntityRef.cs.meta

@@ -1,3 +0,0 @@
-fileFormatVersion: 2
-guid: 2119824a0cfc4b7ab9717faf0884210d
-timeCreated: 1683204652