改成用域名创建websocket

GameClient/Assets/Game/HotUpdate/ETCodes/Hotfix/App/Login/LoginHelper.cs

@@ -1,5 +1,6 @@
 using System;
 using GFGGame;
+using UnityEngine;
 
 namespace ET
 {
@@ -12,7 +13,8 @@ namespace ET
             Session accountSession = null;
             try
             {
-                accountSession = zoneScene.GetComponent<NetWSComponent>().Create(NetworkHelper.ToIPEndPoint(address));
+                Debug.Log($"address:{address}");
+                accountSession = zoneScene.GetComponent<NetWSComponent>().Create(address);
 
                 a2CLoginAccount = (A2C_LoginAccount)await accountSession.Call(new C2A_LoginTest()
                 {
@@ -23,14 +25,16 @@ namespace ET
                     CancelDelete = cancelDelete,
                     Token = ""
                 });
+                Debug.Log($"address:{address}  222");
             }
             catch (Exception e)
             {
                 //accountSession?.Dispose();
-                Log.Debug(e.ToString());
+                Log.Debug("打印报错:" + e.ToString());
                 return (ErrorCode.ERR_NetWorkError, 0);
             }
 
+            Debug.Log($"address:{address}  333");
             if (a2CLoginAccount.Error != ErrorCode.ERR_Success)
             {
                 //accountSession?.Dispose();
@@ -49,7 +53,7 @@ namespace ET
             Session accountSession = null;
             try
             {
-                accountSession = zoneScene.GetComponent<NetWSComponent>().Create(NetworkHelper.ToIPEndPoint(address));
+                accountSession = zoneScene.GetComponent<NetWSComponent>().Create(address);
                 var passwordMD5 = password;
                 //密码禁止明文传输
                 if (!isMD5)
@@ -107,7 +111,7 @@ namespace ET
             Session session = null;
             try
             {
-                session = zoneScene.GetComponent<NetWSComponent>().Create(NetworkHelper.ToIPEndPoint(address));
+                session = zoneScene.GetComponent<NetWSComponent>().Create(address);
                 {
                     //密码禁止明文传输
                     var passwordMD5 = MD5Helper.stringMD5(password);
@@ -135,7 +139,7 @@ namespace ET
             }
 
             return ErrorCode.ERR_Success;
-        }   
+        }
 
         public static async ETTask<int> GetServerInfos(Scene zoneScene)
         {
@@ -321,9 +325,9 @@ namespace ET
             string realmAddress = zoneScene.GetComponent<AccountInfoComponent>().RealmAddress;
             //1.连接Realm，获取分配的Gate
             R2C_LoginRealm r2C_LoginRealm = null;
-            
+
             Session session = zoneScene.GetComponent<NetWSComponent>()
-                .Create(NetworkHelper.ToIPEndPoint(realmAddress));
+                .Create(realmAddress);
             try
             {
                 r2C_LoginRealm = (R2C_LoginRealm)await session.Call(new C2R_LoginRealm()
@@ -348,7 +352,7 @@ namespace ET
 
             LogUtil.LogDev($"GateAddress : {r2C_LoginRealm.GateAddress}");
             Session gateSession = zoneScene.GetComponent<NetWSComponent>()
-                .Create(NetworkHelper.ToIPEndPoint(r2C_LoginRealm.GateAddress));
+                .Create(r2C_LoginRealm.GateAddress);
             gateSession.AddComponent<PingComponent>();
             gateSession.AddComponent<DisConnectedCompnent>().SessionState = SessionState.Gate;
             zoneScene.GetComponent<SessionComponent>().GateSession = gateSession;
@@ -453,7 +457,7 @@ namespace ET
             {
                 notLogin = true;
                 accountSession = GameGlobal.zoneScene.GetComponent<NetWSComponent>()
-                    .Create(NetworkHelper.ToIPEndPoint(GameConfig.LoginAddress));
+                    .Create(GameConfig.LoginAddress);
             }
 
             try
@@ -468,7 +472,7 @@ namespace ET
                 Log.Debug(e.ToString());
                 if (notLogin)
                 {
-                   // accountSession?.Dispose();
+                    // accountSession?.Dispose();
                 }
 
                 return (ErrorCode.ERR_NetWorkError, "");

GameClient/Assets/Game/HotUpdate/GameConfig.cs

@@ -32,7 +32,8 @@ namespace GFGGame
             var result = JsonMapper.ToObject<Result>(json);
             LoginAddress = result.loginApiUrl;
             //LoginAddress = "43.139.184.240:10003";
-            //LoginAddress = "129.204.4.238:10013";//测试地址
+            //LoginAddress = "129.204.4.238:11005";//测试地址
+            //LoginAddress = "192.168.1.191:11005";//测试地址
             showGM = int.Parse(result.showGM);
             if(!string.IsNullOrEmpty(result.openTime))
             {

GameClient/Assets/Game/HotUpdate/ServerProxy/AccountSProxy.cs

@@ -17,8 +17,9 @@ namespace GFGGame
             if (accountSession == null || accountSession.IsDisposed)
             {
                 notLogin = true;
-                accountSession = GameGlobal.zoneScene.GetComponent<NetWSComponent>().Create(NetworkHelper.ToIPEndPoint(GameConfig.LoginAddress));
+                accountSession = GameGlobal.zoneScene.GetComponent<NetWSComponent>().Create(GameConfig.LoginAddress);
             }
+
             try
             {
                 AccountInfoComponent accountInfoComponent = GameGlobal.zoneScene.GetComponent<AccountInfoComponent>();
@@ -31,7 +32,7 @@ namespace GFGGame
                     ChannelId = LauncherConfig.ChannelId
                 });
             }
-            catch(Exception e)
+            catch (Exception e)
             {
                 Log.Debug(e.ToString());
                 ErrorCodeController.Handler(ErrorCode.ERR_NetWorkError);
@@ -39,9 +40,11 @@ namespace GFGGame
                 {
                     accountSession?.Dispose();
                 }
+
                 return false;
             }
-            if(response.Error != ErrorCode.ERR_Success)
+
+            if (response.Error != ErrorCode.ERR_Success)
             {
                 ErrorCodeController.Handler(response.Error);
 
@@ -49,13 +52,16 @@ namespace GFGGame
                 {
                     accountSession?.Dispose();
                 }
+
                 return false;
             }
+
             if (notLogin)
             {
                 accountSession?.Dispose();
             }
+
             return true;
         }
     }
-}
+}

GameClient/GameClient.sln.DotSettings.user

@@ -4,9 +4,12 @@
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AActivator_002Ecs_002Fl_003AC_0021_003FUsers_003Fss510_003FAppData_003FRoaming_003FJetBrains_003FRider2025_002E1_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F695d1cc93cca45069c528c15c9fdd7493e2800_003F20_003F3a0a5fc0_003FActivator_002Ecs_002Fz_003A2_002D1/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AArraySortHelper_00601_002Ecs_002Fl_003AC_0021_003FUsers_003Fss510_003FAppData_003FRoaming_003FJetBrains_003FRider2025_002E1_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F695d1cc93cca45069c528c15c9fdd7493e2800_003Fe0_003F4c18b32c_003FArraySortHelper_00601_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003ABuildResult_002Ecs_002Fl_003AC_0021_003FUsers_003Fadmin_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F8d4895b259be41298a685a0c9b42357576b400_003Fa9_003Fbef924de_003FBuildResult_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
+	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AClientWebSocket_002Ecs_002Fl_003AC_0021_003FUsers_003Fss510_003FAppData_003FRoaming_003FJetBrains_003FRider2025_002E1_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003Fd6e153aa051345dc96d9a55ee3adc812360448_003Ff3_003F47536ad5_003FClientWebSocket_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AEditorUtility_002Ecs_002Fl_003AC_0021_003FUsers_003Fss510_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E2_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F8d4895b259be41298a685a0c9b42357576b400_003F3f_003Fa805acc1_003FEditorUtility_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AFile_002Ecs_002Fl_003AC_0021_003FUsers_003Fss510_003FAppData_003FRoaming_003FJetBrains_003FRider2025_002E1_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F695d1cc93cca45069c528c15c9fdd7493e2800_003Fc3_003F83d8926e_003FFile_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
+	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AHttpListenerContext_002Ecs_002Fl_003AC_0021_003FUsers_003Fss510_003FAppData_003FRoaming_003FJetBrains_003FRider2025_002E1_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003Fd6e153aa051345dc96d9a55ee3adc812360448_003F95_003Ff824ec98_003FHttpListenerContext_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AIEnumerator_00601_002Ecs_002Fl_003AC_0021_003FUsers_003Fss510_003FAppData_003FRoaming_003FJetBrains_003FRider2025_002E1_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F3789ee403a53437cbb6b5d9ab6311f51573620_003F4e_003Faad6c3b2_003FIEnumerator_00601_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
+	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AIPEndPoint_002Ecs_002Fl_003AC_0021_003FUsers_003Fss510_003FAppData_003FRoaming_003FJetBrains_003FRider2025_002E1_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003Fd6e153aa051345dc96d9a55ee3adc812360448_003Fa6_003F47eb89a0_003FIPEndPoint_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AList_00601_002Ecs_002Fl_003AC_0021_003FUsers_003Fss510_003FAppData_003FRoaming_003FJetBrains_003FRider2025_002E1_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F3789ee403a53437cbb6b5d9ab6311f51573620_003Fa3_003F60d291b6_003FList_00601_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003ALogType_002Ecs_002Fl_003AC_0021_003FUsers_003Fss510_003FAppData_003FRoaming_003FJetBrains_003FRider2025_002E1_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F683a2b31bf9142429c44f02c75dbc6c913ce00_003F75_003Fd87ba9d0_003FLogType_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AMemberInfo_002Ecs_002Fl_003AC_0021_003FUsers_003Fss510_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F9c2967a135e648bdb993c5397a44991b573620_003F69_003F4bdfd6bb_003FMemberInfo_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
@@ -27,4 +30,5 @@
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003ATask_00601_002Ecs_002Fl_003AC_0021_003FUsers_003Fss510_003FAppData_003FRoaming_003FJetBrains_003FRider2025_002E1_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F695d1cc93cca45069c528c15c9fdd7493e2800_003Fba_003Fd47fe324_003FTask_00601_002Ecs_002Fz_003A2_002D1/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AVector3_002Ecs_002Fl_003AC_0021_003FUsers_003Fss510_003FAppData_003FRoaming_003FJetBrains_003FRider2025_002E1_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F683a2b31bf9142429c44f02c75dbc6c913ce00_003F1a_003F53ed0524_003FVector3_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AWebSocketState_002Ecs_002Fl_003AC_0021_003FUsers_003Fadmin_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003Fc0c221501f3a41f8ac0af9d6a9dc9ff335fd90_003Fb5_003F7e198be5_003FWebSocketState_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
+	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AWebSocket_002Ecs_002Fl_003AC_0021_003FUsers_003Fss510_003FAppData_003FRoaming_003FJetBrains_003FRider2025_002E1_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003Fd6e153aa051345dc96d9a55ee3adc812360448_003Ffb_003F90be827d_003FWebSocket_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	</wpf:ResourceDictionary>