hexiaojie 7 месяцев назад
Родитель
Сommit
e9bb016b08

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

@@ -15,7 +15,7 @@ namespace ET
             {
                 Debug.Log($"address:{address}");
                 accountSession = zoneScene.GetComponent<NetWSComponent>()
-                    .Create(NetworkHelper.ToIPEndPoint(address), address);
+                    .Create(null, address);
 
                 a2CLoginAccount = (A2C_LoginAccount)await accountSession.Call(new C2A_LoginTest()
                 {
@@ -55,7 +55,7 @@ namespace ET
             try
             {
                 accountSession = zoneScene.GetComponent<NetWSComponent>()
-                    .Create(NetworkHelper.ToIPEndPoint(address), address);
+                    .Create(null, address);
                 var passwordMD5 = password;
                 //密码禁止明文传输
                 if (!isMD5)
@@ -113,7 +113,7 @@ namespace ET
             Session session = null;
             try
             {
-                session = zoneScene.GetComponent<NetWSComponent>().Create(NetworkHelper.ToIPEndPoint(address), address);
+                session = zoneScene.GetComponent<NetWSComponent>().Create(null, address);
                 {
                     //密码禁止明文传输
                     var passwordMD5 = MD5Helper.stringMD5(password);
@@ -329,7 +329,7 @@ namespace ET
             R2C_LoginRealm r2C_LoginRealm = null;
 
             Session session = zoneScene.GetComponent<NetWSComponent>()
-                .Create(NetworkHelper.ToIPEndPoint(realmAddress), realmAddress);
+                .Create(null, realmAddress);
             try
             {
                 r2C_LoginRealm = (R2C_LoginRealm)await session.Call(new C2R_LoginRealm()
@@ -354,7 +354,7 @@ namespace ET
 
             LogUtil.LogDev($"GateAddress : {r2C_LoginRealm.GateAddress}");
             Session gateSession = zoneScene.GetComponent<NetWSComponent>()
-                .Create(NetworkHelper.ToIPEndPoint(r2C_LoginRealm.GateAddress), r2C_LoginRealm.GateAddress);
+                .Create(null, r2C_LoginRealm.GateAddress);
             gateSession.AddComponent<PingComponent>();
             gateSession.AddComponent<DisConnectedCompnent>().SessionState = SessionState.Gate;
             zoneScene.GetComponent<SessionComponent>().GateSession = gateSession;
@@ -459,7 +459,7 @@ namespace ET
             {
                 notLogin = true;
                 accountSession = GameGlobal.zoneScene.GetComponent<NetWSComponent>()
-                    .Create(NetworkHelper.ToIPEndPoint(GameConfig.LoginAddress), GameConfig.LoginAddress);
+                    .Create(null, GameConfig.LoginAddress);
             }
 
             try

+ 4 - 2
GameClient/Assets/Game/HotUpdate/NetworkTCP/WChannel_WebGL.cs

@@ -26,13 +26,15 @@ namespace ET
 
             string wsStr = $"ws://{ipEndPoint}";
 
+            Log.Debug($"wc address:{address}");
             if (LauncherConfig.isHttps)
             {
                 Uri uri = new Uri(address);
                 string hostAndPath = uri.Host + uri.AbsolutePath;
                 wsStr = $"wss://{hostAndPath}";
             }
-            
+            Log.Debug($"wc wsStr:{wsStr}");
+
             WebSocket ws = new WebSocket(new Uri(wsStr));
 
             if (LauncherConfig.isHttps)
@@ -43,7 +45,7 @@ namespace ET
             {
                 this.RemoteAddress = ipEndPoint;
             }
-            
+
             // Subscribe to the WS events
             ws.OnOpen += OnOpen;
             ws.OnClosed += OnClosed;

+ 1 - 1
GameClient/Assets/Game/HotUpdate/ServerProxy/AccountSProxy.cs

@@ -18,7 +18,7 @@ namespace GFGGame
             {
                 notLogin = true;
                 accountSession = GameGlobal.zoneScene.GetComponent<NetWSComponent>()
-                    .Create(NetworkHelper.ToIPEndPoint(GameConfig.LoginAddress), GameConfig.LoginAddress);
+                    .Create(null, GameConfig.LoginAddress);
             }
 
             try

+ 1 - 0
GameClient/GameClient.sln.DotSettings.user

@@ -5,6 +5,7 @@
 	<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_003ABitConverter_002Ecs_002Fl_003AC_0021_003FUsers_003Fadmin_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F9c2967a135e648bdb993c5397a44991b573620_003F5e_003Fa3f03c48_003FBitConverter_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_003ADns_002Ecs_002Fl_003AC_0021_003FUsers_003Fss510_003FAppData_003FRoaming_003FJetBrains_003FRider2025_002E1_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003Fd6e153aa051345dc96d9a55ee3adc812360448_003Fb6_003F1bebb6b7_003FDns_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_003AIBufferWriter_00601_002Ecs_002Fl_003AC_0021_003FUsers_003Fadmin_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003Fa5006ea2ea344a8e8c71a2eb982aadc024518_003Fef_003F2e83f7a0_003FIBufferWriter_00601_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>