瀏覽代碼

修复NetHelper在mac下运行错误的bug,InnerMessageDispatcher出错时打印消息

tanghai 7 年之前
父節點
當前提交
7b746a2283

+ 1 - 1
Client-Server.sln.DotSettings.user

@@ -42,7 +42,7 @@
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=EE38E3D2_002D3D2A_002D4061_002DBD50_002DAE8568126C7D_002Fd_003AEntity_002Fd_003AConfig_002Ff_003AStartConfig_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=EE38E3D2_002D3D2A_002D4061_002DBD50_002DAE8568126C7D_002Fd_003AModule_002Fd_003AMessage_002Ff_003AAMRpcHandler_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=EE38E3D2_002D3D2A_002D4061_002DBD50_002DAE8568126C7D_002Fd_003AModule_002Fd_003AMessage_002Ff_003ANetInnerComponent_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
-	<s:String x:Key="/Default/CodeInspection/Highlighting/AnalysisEnabled/@EntryValue">VISIBLE_FILES</s:String>
+	
 	
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=EnforceForeachStatementBraces/@EntryIndexedValue">HINT</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=EnforceIfStatementBraces/@EntryIndexedValue">HINT</s:String>

+ 4 - 4
Server/Hotfix/Module/Message/InnerMessageDispatcher.cs

@@ -14,7 +14,7 @@ namespace ETHotfix
 					Entity entity = (Entity)Game.EventSystem.Get(iActorRequest.ActorId);
 					if (entity == null)
 					{
-						Log.Warning($"not found actor: {iActorRequest.ActorId}");
+						Log.Warning($"not found actor: {message}");
 						ActorResponse response = new ActorResponse
 						{
 							Error = ErrorCode.ERR_NotFoundActor,
@@ -33,7 +33,7 @@ namespace ETHotfix
 							RpcId = iActorRequest.RpcId
 						};
 						session.Reply(response);
-						Log.Error($"actor没有挂载MailBoxComponent组件: {entity.GetType().Name} {entity.Id}");
+						Log.Error($"actor not add MailBoxComponent: {entity.GetType().Name} {message}");
 						return;
 					}
 				
@@ -45,14 +45,14 @@ namespace ETHotfix
 					Entity entity = (Entity)Game.EventSystem.Get(iactorMessage.ActorId);
 					if (entity == null)
 					{
-						Log.Error($"not found actor: {iactorMessage.ActorId}");
+						Log.Error($"not found actor: {message}");
 						return;
 					}
 	
 					MailBoxComponent mailBoxComponent = entity.GetComponent<MailBoxComponent>();
 					if (mailBoxComponent == null)
 					{
-						Log.Error($"actor not add MailBoxComponent: {iactorMessage.ActorId}");
+						Log.Error($"actor not add MailBoxComponent: {entity.GetType().Name} {message}");
 						return;
 					}
 				

+ 1 - 4
Unity/Assets/Model/Base/Helper/NetHelper.cs

@@ -11,10 +11,7 @@ namespace ETModel
 			List<string> addressIPs = new List<string>();
 			foreach (IPAddress address in Dns.GetHostEntry(Dns.GetHostName()).AddressList)
 			{
-				if (address.AddressFamily.ToString() == "InterNetwork")
-				{
-					addressIPs.Add(address.ToString());
-				}
+				addressIPs.Add(address.ToString());
 			}
 			return addressIPs.ToArray();
 		}

File diff suppressed because it is too large
+ 1 - 2
Unity/Unity.Editor.csproj


File diff suppressed because it is too large
+ 1 - 2
Unity/Unity.Hotfix.csproj


File diff suppressed because it is too large
+ 2 - 3
Unity/Unity.Model.csproj


File diff suppressed because it is too large
+ 1 - 1
Unity/Unity.ThirdParty.csproj


Some files were not shown because too many files changed in this diff